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

108 Commits

Author SHA1 Message Date
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
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
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
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
123ba04025 Collected coin amount is displayed 2022-10-29 23:13:00 -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
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
Soulaha Balde
830e8220d0 Add ui controller 
fix duplicate gameControllers
 2022-10-29 17:38:12 -04:00
Jean Lamarre
9a920baaa7 ok visual, stop me 2022-10-29 17:30:26 -04:00
louishorlaville
46946fd028 Add music and ambiance prefabs with temp music file 2022-10-29 17:13:40 -04:00
Jean Lamarre
6d9ada8b4b wip, because im losing my shit 2022-10-29 16:47:51 -04:00
craftwill
aa5f25e646 Level2Art started; Added torches 2022-10-29 15:54:49 -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
8912d8125f postprocessing? 2022-10-29 15:32:05 -04:00
Jean Lamarre
055124b1bd wip fix 2022-10-29 15:31:20 -04:00
Jean Lamarre
9843650fb3 wip visual 2022-10-29 15:20:28 -04:00
Soulaha
f37d9f652e Pull request #18: Obstacles 
Merge in CEGJ/32bit_jam_conjure from Obstacles to Dev

* commit '0e5a5a9123b51bb734dbeee17aa94652c67d993e':
  Add unity event
  Added obj spawner
 2022-10-29 19:05:38 +00:00
Soulaha Balde
0e5a5a9123 Merge branch 'Dev' into Obstacles 2022-10-29 15:02:49 -04:00
Soulaha Balde
2f486c38eb Scene setup 2022-10-29 14:56:03 -04:00
craftwill
c7e2ba805b Working ragdoll; Added sounds bytes utils 2022-10-29 14:45:29 -04:00
Jean Lamarre
f0bbc14f89 Merge branch 'Dev' into Retro-Visual 
# Conflicts:
#	Assets/Material/Rock texture light.mat
#	Assets/Material/Rock texture light.mat.meta
#	Assets/Prefabs/Level1.prefab
 2022-10-29 13:49:49 -04:00
craftwill
aac756a05f merged level2 and level1 2022-10-29 13:40:27 -04:00
craftwill
1d1e411b9b More details in level and level1, added windmills 2022-10-29 13:33:21 -04:00
Jean Lamarre
f18ababda3 Menu + spalsh screen 2022-10-29 13:32:41 -04:00
Alain Abboud
b0a4512071 Merge remote-tracking branch 'origin/Dev' into Level2 2022-10-29 13:24:59 -04:00
Soulaha Balde
0dff2c1329 Merge branch 'Dev' into GameLogic 2022-10-29 13:11:04 -04:00
Alain Abboud
a92e4ba34c Level 2 finished 2022-10-29 12:59:35 -04:00