Commit Graph

Select branches

Hide Pull Requests

CharacterMovement

Coins

Dev

GameLogic

Obstacles

Ragdoll

Retro-Visual

UI-MainMenu

VolumeSlider

dev

master

Mono Color

• bd097bed3d aspect ratio solution Dev Jean Lamarre 2022-10-31 09:23:07 -04:00
• 3c93a1da68 Added PauseMenu to main Scene and le nom de Alain louishorlaville 2022-10-30 23:47:08 -04:00
• beba661515 remove coins txt Soulaha Balde 2022-10-30 23:24:48 -04:00
• 671c2d35e9 Added 3 (!) diff musics Soulaha Balde 2022-10-30 23:11:03 -04:00
• bea5554e59 Fix double music on replay Soulaha Balde 2022-10-30 22:43:53 -04:00
• ec7fec4874 Pull request #36: LevelDesignFix Louis Horlaville 2022-10-31 02:16:02 +00:00
• 6a94a7cee0 Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into LevelDesignFix louishorlaville 2022-10-30 22:13:29 -04:00
• a2fa251890 Fixes louishorlaville 2022-10-30 22:12:58 -04:00
• c59882359e Pull request #35: FixReplay Soulaha 2022-10-31 02:10:16 +00:00
• f22ee3acd4 debug clean up Soulaha Balde 2022-10-30 22:07:59 -04:00
• 099c7e4cbe Fix replay from main menu Soulaha Balde 2022-10-30 22:06:03 -04:00
• 8091d5e349 Pull request #34: Sounds Louis Horlaville 2022-10-31 01:01:10 +00:00
• 2a27662b8b Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into Sounds louishorlaville 2022-10-30 20:59:50 -04:00
• 60fb7d0ff6 added sounds and sweated pause menu bugs louishorlaville 2022-10-30 20:59:18 -04:00
• 81a4d58e27 Pull request #33: Set correct player spawn, fix meshes in level2 William Gingras 01 2022-10-31 00:54:08 +00:00
• b6f4f2b2e1 Set correct player spawn, fix meshes in level2 craftwill 2022-10-30 20:53:07 -04:00
• 836278f8e1 Pull request #32: Level2FinalIntegration William Gingras 01 2022-10-31 00:43:52 +00:00
• 986370682a Merge branch 'Dev' into Level2FinalIntegration craftwill 2022-10-30 20:42:21 -04:00
• ca2efb5609 Pull request #31: Tweaked End scene Louis Horlaville 2022-10-31 00:42:06 +00:00
• 1ef97e6b1a Ended moved craftwill 2022-10-30 20:41:02 -04:00
• a3c02260aa Level2 finished; Ending added craftwill 2022-10-30 20:40:16 -04:00
• b680658b9a Level2 nearly done craftwill 2022-10-30 20:16:49 -04:00
• 0f9c483f23 Started part3 of level2 craftwill 2022-10-30 19:37:50 -04:00
• 31665e3e11 Merge branch 'Dev' into Level2FinalIntegration craftwill 2022-10-30 19:18:37 -04:00
• 80060b032d Level2 checkpoint craftwill 2022-10-30 19:18:20 -04:00
• 8576c2faa3 Fix lights in mainMenu Soulaha Balde 2022-10-30 19:07:42 -04:00
• aa081b3dd1 Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into TweakEnding louishorlaville 2022-10-30 18:26:18 -04:00
• 8915e51ea5 Tweaked End scene louishorlaville 2022-10-30 18:23:56 -04:00
• 125dbd73ce Pull request #30: ShaderVolume DontDestroyOnLoad Jean Lamarre 01 2022-10-30 22:05:06 +00:00
• 62b01269dd ShaderVolume DontDestroyOnLoad Retro-Visual Jean Lamarre 2022-10-30 18:03:09 -04:00
• a64d5bf0a7 First push craftwill 2022-10-30 17:57:34 -04:00
• b0584dd46d Pull request #29: Cannot Grapple Spikes anymore Louis Horlaville 2022-10-30 21:29:03 +00:00
• 1c8c15c7ef Cannot Grapple Spikes anymore louishorlaville 2022-10-30 17:25:58 -04:00
• b3a56f79bd Pull request #23: Level2Art William Gingras 01 2022-10-30 20:47:07 +00:00
• 2c2843c6e0 Fix merge conflicts craftwill 2022-10-30 16:45:41 -04:00
• d974340f7a Pull request #28: Pause Menu Added Louis Horlaville 2022-10-30 20:07:36 +00:00
• 29f95e038d Pause Menu Added louishorlaville 2022-10-30 16:04:17 -04:00
• 4941b676a3 Pull request #27: fix ragdoll spacebar Soulaha 2022-10-30 19:46:40 +00:00
• 3d24df4fb2 fix ragdoll spacebar GameLogic Soulaha Balde 2022-10-30 15:23:57 -04:00
• bddfd3ca7d Pull request #26: Final ver of endScene Soulaha 2022-10-30 19:19:14 +00:00
• c13d7d1883 Final ver of endScene Soulaha Balde 2022-10-30 15:16:20 -04:00
• 90abbd3e57 Pull request #25: MainMenu Rework Louis Horlaville 2022-10-30 15:05:01 +00:00
• a3fc68b397 Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into VolumeSlider VolumeSlider louishorlaville 2022-10-30 01:48:27 -04:00
• eb0bad2d43 more windmill speed diversity louishorlaville 2022-10-30 01:47:18 -04:00
• 873eb492c7 Added Volume slider as prefab louishorlaville 2022-10-30 01:42:29 -04:00
• acc9a1ad2b Polished credits and main menu louishorlaville 2022-10-30 01:34:25 -04:00
• f40d0bcc5e Pull request #24: Coins Soulaha 2022-10-30 03:38:18 +00:00
• dc38bdbdb7 collected coin amount is displayed in end scene Coins Soulaha Balde 2022-10-29 23:28:19 -04:00
• 123ba04025 Collected coin amount is displayed Soulaha Balde 2022-10-29 23:13:00 -04:00
• c6ce11ec82 Collected coin amount is tracked Soulaha Balde 2022-10-29 22:49:26 -04:00
• f29d349fde Add guiding coins Remove grapple charges Soulaha Balde 2022-10-29 22:30:08 -04:00
• 400c5a1183 Volume Slider up and working louishorlaville 2022-10-29 22:17:13 -04:00
• ba4ef9f55f Merge branch 'grappling' into Coins Soulaha Balde 2022-10-29 21:47:34 -04:00
• 7d7cee0c2f Merge resolve louishorlaville 2022-10-29 21:42:23 -04:00
• a680c5bf39 Main Menu background louishorlaville 2022-10-29 21:36:56 -04:00
• 17cc729abd Add scene change craftwill 2022-10-29 21:36:29 -04:00
• c13d7e7c23 Pull request #21: Retro Visual Jean Lamarre 01 2022-10-30 00:35:51 +00:00
• f344527f0e Pull request #22: GameLogic Soulaha 2022-10-30 00:35:35 +00:00
• 758777b8ab missing in last commit Soulaha Balde 2022-10-29 20:24:53 -04:00
• 061f6138b1 Level switcher Environnement changer Soulaha Balde 2022-10-29 20:24:42 -04:00
• 8c72d399d5 mat rock?? Jean Lamarre 2022-10-29 19:44:54 -04:00
• ff34d099af Remove unused Jean Lamarre 2022-10-29 19:37:10 -04:00
• b020428ca6 remove changes? Jean Lamarre 2022-10-29 19:31:58 -04:00
• ca83cff576 Merge branch 'Dev' into Retro-Visual Jean Lamarre 2022-10-29 19:28:32 -04:00
• 83c338794b FIXED, dont know wat i did Jean Lamarre 2022-10-29 19:25:16 -04:00
• 8aee8663ae fixed? Jean Lamarre 2022-10-29 18:32:02 -04:00
• 6ba5e5b97c Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into dev Yumahey 2022-10-29 17:43:36 -04:00
• d0a7714e60 New models Yumahey 2022-10-29 17:43:26 -04:00
• 830e8220d0 Add ui controller fix duplicate gameControllers Soulaha Balde 2022-10-29 17:38:12 -04:00
• 9a920baaa7 ok visual, stop me Jean Lamarre 2022-10-29 17:30:26 -04:00
• 7475e4ce73 Pull request #20: Sound addings Louis Horlaville 2022-10-29 21:21:18 +00:00
• 46946fd028 Add music and ambiance prefabs with temp music file louishorlaville 2022-10-29 17:13:40 -04:00
• 4b36c99d8e Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into Sound louishorlaville 2022-10-29 17:06:11 -04:00
• b924890951 Added sounds to player scripts louishorlaville 2022-10-29 16:48:18 -04:00
• 6d9ada8b4b wip, because im losing my shit Jean Lamarre 2022-10-29 16:47:51 -04:00
• 538c133d86 Door & chandelier model Yumahey 2022-10-29 16:02:58 -04:00
• aa5f25e646 Level2Art started; Added torches craftwill 2022-10-29 15:54:49 -04:00
• 9c9b8d1601 Pull request #19: GameLogic Soulaha 2022-10-29 19:42:21 +00:00
• 7e32d6c205 Full loop from main menu to levels to end scene Soulaha Balde 2022-10-29 15:36:26 -04:00
• 8912d8125f postprocessing? Jean Lamarre 2022-10-29 15:32:05 -04:00
• 055124b1bd wip fix Jean Lamarre 2022-10-29 15:31:20 -04:00
• c8c7b23e1a fix CRT Jean Lamarre 2022-10-29 15:23:29 -04:00
• 9843650fb3 wip visual Jean Lamarre 2022-10-29 15:20:28 -04:00
• f37d9f652e Pull request #18: Obstacles Soulaha 2022-10-29 19:05:38 +00:00
• 0e5a5a9123 Merge branch 'Dev' into Obstacles Obstacles Soulaha Balde 2022-10-29 15:02:49 -04:00
• 54a2575703 Add unity event Soulaha Balde 2022-10-29 15:02:18 -04:00
• 2f486c38eb Scene setup Soulaha Balde 2022-10-29 14:56:03 -04:00
• 66211085cb Pull request #17: Working ragdoll; Added sounds bytes utils William Gingras 01 2022-10-29 18:46:32 +00:00
• c7e2ba805b Working ragdoll; Added sounds bytes utils craftwill 2022-10-29 14:45:29 -04:00
• aea0ed7270 tune down noise shader Jean Lamarre 2022-10-29 14:04:10 -04:00
• f0bbc14f89 Merge branch 'Dev' into Retro-Visual Jean Lamarre 2022-10-29 13:49:49 -04:00
• f2714ac16e icon Jean Lamarre 2022-10-29 13:47:20 -04:00
• 6535829abd Pull request #16: More details in level and level1, added windmills William Gingras 01 2022-10-29 17:41:47 +00:00
• aac756a05f merged level2 and level1 craftwill 2022-10-29 13:40:27 -04:00
• 1d1e411b9b More details in level and level1, added windmills craftwill 2022-10-29 13:33:21 -04:00
• f18ababda3 Menu + spalsh screen Jean Lamarre 2022-10-29 13:32:41 -04:00
• d51cb23741 Pull request #15: Level2 Alain Abboud (Lingito / Swifty) 2022-10-29 17:28:18 +00:00
• b0a4512071 Merge remote-tracking branch 'origin/Dev' into Level2 Alain Abboud 2022-10-29 13:24:59 -04:00
• 0dff2c1329 Merge branch 'Dev' into GameLogic Soulaha Balde 2022-10-29 13:11:04 -04:00
• a92e4ba34c Level 2 finished Alain Abboud 2022-10-29 12:59:35 -04:00