Conjure/32bit_jam_conjure
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
197 Commits 11 Branches 0 Tags
Commit Graph

161 Commits

Author SHA1 Message Date
louishorlaville
6a94a7cee0 Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into LevelDesignFix 2022-10-30 22:13:29 -04:00
louishorlaville
a2fa251890 Fixes 2022-10-30 22:12:58 -04:00
Soulaha Balde
f22ee3acd4 debug clean up 2022-10-30 22:07:59 -04:00
Soulaha Balde
099c7e4cbe Fix replay from main menu 2022-10-30 22:06:03 -04:00
louishorlaville
2a27662b8b Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into Sounds 2022-10-30 20:59:50 -04:00
louishorlaville
60fb7d0ff6 added sounds and sweated pause menu bugs 2022-10-30 20:59:18 -04:00
craftwill
b6f4f2b2e1 Set correct player spawn, fix meshes in level2 2022-10-30 20:53:07 -04:00
craftwill
986370682a Merge branch 'Dev' into Level2FinalIntegration 2022-10-30 20:42:21 -04:00
Louis Horlaville
ca2efb5609 Pull request #31: Tweaked End scene 
Merge in CEGJ/32bit_jam_conjure from TweakEnding to Dev

* commit 'aa081b3dd148dbea55910fdcbe4c6c6225f1bf84':
  Tweaked End scene
 2022-10-31 00:42:06 +00:00
craftwill
1ef97e6b1a Ended moved 2022-10-30 20:41:02 -04:00
craftwill
a3c02260aa Level2 finished; Ending added 2022-10-30 20:40:16 -04:00
craftwill
b680658b9a Level2 nearly done 2022-10-30 20:16:49 -04:00
craftwill
0f9c483f23 Started part3 of level2 2022-10-30 19:37:50 -04:00
craftwill
31665e3e11 Merge branch 'Dev' into Level2FinalIntegration 2022-10-30 19:18:37 -04:00
craftwill
80060b032d Level2 checkpoint 2022-10-30 19:18:20 -04:00
Soulaha Balde
8576c2faa3 Fix lights in mainMenu 2022-10-30 19:07:42 -04:00
louishorlaville
aa081b3dd1 Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into TweakEnding 2022-10-30 18:26:18 -04:00
louishorlaville
8915e51ea5 Tweaked End scene 2022-10-30 18:23:56 -04:00
Jean Lamarre
62b01269dd ShaderVolume DontDestroyOnLoad 2022-10-30 18:03:09 -04:00
craftwill
a64d5bf0a7 First push 2022-10-30 17:57:34 -04:00
louishorlaville
1c8c15c7ef Cannot Grapple Spikes anymore 2022-10-30 17:25:58 -04:00
craftwill
2c2843c6e0 Fix merge conflicts 2022-10-30 16:45:41 -04:00
louishorlaville
29f95e038d Pause Menu Added 2022-10-30 16:04:17 -04:00
Soulaha Balde
3d24df4fb2 fix ragdoll spacebar 2022-10-30 15:23:57 -04:00
Soulaha Balde
c13d7d1883 Final ver of endScene 2022-10-30 15:16:20 -04:00
louishorlaville
a3fc68b397 Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into VolumeSlider 2022-10-30 01:48:27 -04:00
louishorlaville
eb0bad2d43 more windmill speed diversity 2022-10-30 01:47:18 -04:00
louishorlaville
873eb492c7 Added Volume slider as prefab 2022-10-30 01:42:29 -04:00
louishorlaville
acc9a1ad2b Polished credits and main menu 2022-10-30 01:34:25 -04:00
Soulaha Balde
dc38bdbdb7 collected coin amount is displayed in end scene 2022-10-29 23:28:19 -04:00
Soulaha Balde
123ba04025 Collected coin amount is displayed 2022-10-29 23:13:00 -04:00
Soulaha Balde
c6ce11ec82 Collected coin amount is tracked 2022-10-29 22:49:26 -04:00
Soulaha Balde
f29d349fde Add guiding coins 
Remove grapple charges
 2022-10-29 22:30:08 -04:00
louishorlaville
400c5a1183 Volume Slider up and working 2022-10-29 22:17:13 -04:00
Soulaha Balde
ba4ef9f55f Merge branch 'grappling' into Coins 2022-10-29 21:47:34 -04:00
louishorlaville
7d7cee0c2f Merge resolve 2022-10-29 21:42:23 -04:00
louishorlaville
a680c5bf39 Main Menu background 2022-10-29 21:36:56 -04:00
craftwill
17cc729abd Add scene change 2022-10-29 21:36:29 -04:00
Jean Lamarre 01
c13d7e7c23 Pull request #21: Retro Visual 
Merge in CEGJ/32bit_jam_conjure from Retro-Visual to Dev

* commit '8c72d399d5ddaac749e209ef270390f44be554e2':
  mat rock??
  Remove unused
  remove changes?
  FIXED, dont know wat i did
  fixed?
  ok  visual, stop me
  wip, because im losing my shit
  postprocessing?
  wip fix
  fix CRT
  wip visual
  tune down noise shader
  icon
  Menu + spalsh screen
  Revert "Level1 basic 3D models integration"
  trying to fix UI broken a bit
  fix menu UI cassé a cause Shader + fineTouch
  quite good i think
  wip shaders!!
  wip visual #learningstuff
 2022-10-30 00:35:51 +00:00
Soulaha Balde
758777b8ab missing in last commit 2022-10-29 20:24:53 -04:00
Soulaha Balde
061f6138b1 Level switcher 
Environnement changer
 2022-10-29 20:24:42 -04:00
Jean Lamarre
8c72d399d5 mat rock?? 2022-10-29 19:44:54 -04:00
Jean Lamarre
ff34d099af Remove unused 2022-10-29 19:37:10 -04:00
Jean Lamarre
b020428ca6 remove changes? 2022-10-29 19:31:58 -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
Jean Lamarre
8aee8663ae fixed? 2022-10-29 18:32:02 -04:00
Yumahey
6ba5e5b97c Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into dev 2022-10-29 17:43:36 -04:00
Yumahey
d0a7714e60 New models 2022-10-29 17:43:26 -04:00
Soulaha Balde
830e8220d0 Add ui controller 
fix duplicate gameControllers
 2022-10-29 17:38:12 -04:00