27 Commits

Author SHA1 Message Date
louishorlaville
29f95e038d Pause Menu Added 2022-10-30 16:04:17 -04:00
Soulaha Balde
ba4ef9f55f Merge branch 'grappling' into Coins 2022-10-29 21:47:34 -04:00
Jean Lamarre
ff34d099af Remove unused 2022-10-29 19:37:10 -04:00
Jean Lamarre
ca83cff576 Merge branch 'Dev' into Retro-Visual
# Conflicts:
#	Assets/Scenes/MainMenu.unity
#	ProjectSettings/EditorBuildSettings.asset
2022-10-29 19:28:32 -04:00
Jean Lamarre
83c338794b FIXED, dont know wat i did 2022-10-29 19:25:16 -04:00
Soulaha
9c9b8d1601 Pull request #19: GameLogic
Merge in CEGJ/32bit_jam_conjure from GameLogic to Dev

* commit '7e32d6c205e1d0a3dd65ae3f459a86dade0e0c9f':
  Full loop from main menu to levels to end scene
  Scene setup
  Can go from main menu to game and end game
  singleton game controller
2022-10-29 19:42:21 +00:00
Soulaha Balde
7e32d6c205 Full loop from main menu to levels to end scene 2022-10-29 15:36:26 -04:00
Jean Lamarre
9843650fb3 wip visual 2022-10-29 15:20:28 -04:00
c7e2ba805b Working ragdoll; Added sounds bytes utils 2022-10-29 14:45:29 -04:00
Jean Lamarre
f2714ac16e icon 2022-10-29 13:47:20 -04:00
Jean Lamarre
f18ababda3 Menu + spalsh screen 2022-10-29 13:32:41 -04:00
Jean Lamarre
5e7a9ed899 trying to fix UI broken a bit 2022-10-29 05:14:57 -04:00
Jean Lamarre
f4cad8a5c5 Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into Retro-Visual 2022-10-29 03:13:41 -04:00
Jean Lamarre
3dc83774af wip visual #learningstuff 2022-10-28 14:41:09 -04:00
Soulaha Balde
1690b969ac Can go from main menu to game and end game 2022-10-27 21:39:34 -04:00
Soulaha Balde
603ef2f51f singleton game controller 2022-10-27 21:16:34 -04:00
Alain Abboud
df13db7a9f Première zone terminée, mouvement ajusté 2022-10-27 01:30:18 -04:00
Soulaha Balde
76a7333455 Added collectible to recharge grapple 2022-10-24 19:58:29 -04:00
Soulaha Balde
b57f51cfb5 Obj can vanish and reappear on interaction 2022-10-23 15:49:05 -04:00
Soulaha Balde
b9777f7a62 Colliding with certain obj can stun the player 2022-10-21 21:30:19 -04:00
Soulaha
8bc85ac731 Pull request #5: Grappling
Merge in CEGJ/32bit_jam_conjure from grappling to Dev

* commit 'b2c581a8d53e5c8fa516a7c77953a0dc6dbf9e37':
  save scene
  Can move up and down on rope Change boosting technique
  new test area
  Change hit marker to a ui element
  Rope lerps to grapple point
  Can grapple objects with rigidbodies
  Added grapple layer mask
  Added follow camera
  Grapple moves player and is represented
  Base for grappling
2022-10-20 02:17:54 +00:00
louishorlaville
c14b6e30ae saved scene 2022-10-19 21:56:53 -04:00
Soulaha Balde
e42f7e8f81 Added grapple layer mask 2022-10-19 11:18:36 -04:00
Soulaha Balde
f1e247a9ec Grapple moves player and is represented 2022-10-18 23:22:05 -04:00
Jean Lamarre
2ff07ca50c Add main scene and new input system 2022-10-17 11:33:39 -04:00
Jean Lamarre
a882e9f1d9 settings unity 2022-10-16 18:57:37 -04:00
Jean Lamarre
2ceef3c9e5 unity init 2022-10-16 18:49:46 -04:00