Code

Game manager overhall#7

Code

Open

MartaAlet wants to merge 42 commits intopomedas:mainpomedas/full-body-interaction-template:mainfrom jordialfonsop:GameManagerOverhalljordialfonsop/CatchingChickens:GameManagerOverhallCopy head branch name to clipboard

+149,796-167

Commits

Commits on May 5, 2022

• Primeras modificaciones: el jugador puede pillar la gallina y luego dejarla en su barnyard correspondiente

  mfranchescagonzalezcejas

  committed
  e8b27c9

  Copy full SHA for e8b27c9

Commits on May 8, 2022

• Modelo de Gallina y Escenario Juego V1

  mfranchescagonzalezcejas

  committed
  205599a

  Copy full SHA for 205599a

Commits on May 9, 2022

• Modelo3d Zorro añadido

  mfranchescagonzalezcejas

  committed
  e7ea605

  Copy full SHA for e7ea605

Commits on May 12, 2022

• Modelo Escenario Juego Modificado

  mfranchescagonzalezcejas

  committed
  59dc946

  Copy full SHA for 59dc946

• no message

  mfranchescagonzalezcejas

  committed
  b13a67a

  Copy full SHA for b13a67a

• Merge remote-tracking branch 'origin/RevisionModelo3d' into RevisionModelo3d

  mfranchescagonzalezcejas

  committed
  2fc4fc9

  Copy full SHA for 2fc4fc9

• Revert "no message"

  Show description for dd45577
  mfranchescagonzalezcejas

  committed
  dd45577

  Copy full SHA for dd45577

• Escenario + Galina +Zorro

  mfranchescagonzalezcejas

  committed
  c7b28c8

  Copy full SHA for c7b28c8

• arreglo

  mfranchescagonzalezcejas

  committed
  5eb40f4

  Copy full SHA for 5eb40f4

Commits on May 13, 2022

• Zorro y Escena Modificada

  mfranchescagonzalezcejas

  committed
  8799057

  Copy full SHA for 8799057

• Escenario y Zorro Modificado

  mfranchescagonzalezcejas

  committed
  e94a84c

  Copy full SHA for e94a84c

• Escenario colores modificado

  mfranchescagonzalezcejas

  committed
  5b26daf

  Copy full SHA for 5b26daf

• :)

  MartaAlet

  committed
  37213a8

  Copy full SHA for 37213a8

Commits on May 20, 2022

• Implemented animations

  jordialfonsop

  committed
  b7c1d5b

  Copy full SHA for b7c1d5b

• Added timer

  jordialfonsop

  committed
  a388470

  Copy full SHA for a388470

• Added Timer, Transparent Barnyards, Fixed Battle with Fox, Added gameplay with golden chicken

  MartaAlet

  committed
  5f69b63

  Copy full SHA for 5f69b63

• Deleted repeated timer

  jordialfonsop

  committed
  1633128

  Copy full SHA for 1633128

• Merge branch 'main' into WithBarnyards

  jordialfonsop

  authored
  d7dda69

  Copy full SHA for d7dda69

• Merge pull request #12 from jordialfonsop/WithBarnyards

  Show description for 798f1e4
  jordialfonsop

  authored
  798f1e4

  Copy full SHA for 798f1e4

• Merge branch 'main' into feature/animations

  jordialfonsop

  authored
  b851e45

  Copy full SHA for b851e45

• Merge pull request #13 from jordialfonsop/feature/animations

  Show description for 6fe8c04
  jordialfonsop

  authored
  6fe8c04

  Copy full SHA for 6fe8c04

• fixed conflicts in main

  jordialfonsop

  committed
  1a0150e

  Copy full SHA for 1a0150e

• Delivery Practice 3

  jordialfonsop

  committed
  cc92d82

  Copy full SHA for cc92d82

Commits on May 26, 2022

• Sistema de Puntos funciona

  mfranchescagonzalezcejas

  committed
  bf1d7bd

  Copy full SHA for bf1d7bd

• Merge pull request #25 from jordialfonsop/main+SistemaPuntos

  Show description for 5dbfa04
  mfranchescagonzalezcejas

  authored
  5dbfa04

  Copy full SHA for 5dbfa04

• Collider fox plus resize assets

  MartaAlet

  committed
  58d6aec

  Copy full SHA for 58d6aec

• Merge branch 'main' of https://github.com/jordialfonsop/CatchingChickens

  MartaAlet

  committed
  8a4930e

  Copy full SHA for 8a4930e

• Temps + delete chickens

  MartaAlet

  committed
  eb4f3c3

  Copy full SHA for eb4f3c3

• Updated FoxChickenEater

  Show description for 9e61936
  MartaAlet

  committed
  9e61936

  Copy full SHA for 9e61936

• Updated ChickenEater

  MartaAlet

  committed
  e3b9abd

  Copy full SHA for e3b9abd

• Merge branch 'main' into ChickenEater

  MartaAlet

  committed
  e25b487

  Copy full SHA for e25b487

Commits on May 29, 2022

• Created main menu

  jordialfonsop

  committed
  cbf617c

  Copy full SHA for cbf617c

• Added onTriggerExit

  jordialfonsop

  committed
  1dfb1af

  Copy full SHA for 1dfb1af

• Merge pull request #28 from jordialfonsop/feature/main-menu

  Show description for 1794f22
  jordialfonsop

  authored
  1794f22

  Copy full SHA for 1794f22

• Changed colors

  jordialfonsop

  committed
  0d34276

  Copy full SHA for 0d34276

• Merge pull request #29 from jordialfonsop/feature/main-menu

  Show description for 211e4e1
  jordialfonsop

  authored
  211e4e1

  Copy full SHA for 211e4e1

• Merge pull request #30 from jordialfonsop/ChickenEater

  Show description for 82451f2
  MartaAlet

  authored
  82451f2

  Copy full SHA for 82451f2

• Sistema de Sonido terminado

  Show description for 278d6b0
  mfranchescagonzalezcejas

  committed
  278d6b0

  Copy full SHA for 278d6b0

• Merge pull request #31 from jordialfonsop/SoundManager

  Show description for 4f30750
  jordialfonsop

  authored
  4f30750

  Copy full SHA for 4f30750

• Updated GameManager

  Show description for 9fc95a0
  MartaAlet

  committed
  9fc95a0

  Copy full SHA for 9fc95a0

• Added remaining sounds + added animations to golden chicken

  jordialfonsop

  committed
  1bf8e64

  Copy full SHA for 1bf8e64

• Merge branch 'main' into GameManagerOverhall

  jordialfonsop

  authored
  74d1f4a

  Copy full SHA for 74d1f4a