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

179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 01
125dbd73ce Pull request #30: ShaderVolume DontDestroyOnLoad 
Merge in CEGJ/32bit_jam_conjure from Retro-Visual to Dev

* commit '62b01269ddf9e6c4b71c91151e2278f93772f523':
  ShaderVolume DontDestroyOnLoad
 2022-10-30 22:05:06 +00: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
Louis Horlaville
b0584dd46d Pull request #29: Cannot Grapple Spikes anymore 
Merge in CEGJ/32bit_jam_conjure from GrappleStunFix to Dev

* commit '1c8c15c7efd5c539f6a903fae1f55324f50ffc1c':
  Cannot Grapple Spikes anymore
 2022-10-30 21:29:03 +00:00
louishorlaville
1c8c15c7ef Cannot Grapple Spikes anymore 2022-10-30 17:25:58 -04:00
William Gingras 01
b3a56f79bd Pull request #23: Level2Art 
Merge in CEGJ/32bit_jam_conjure from Level2Art to Dev

* commit '2c2843c6e01ca5db8654dd41e27aaf98dcb2e2a7':
  Add scene change
  Level2Art started; Added torches
 2022-10-30 20:47:07 +00:00
craftwill
2c2843c6e0 Fix merge conflicts 2022-10-30 16:45:41 -04:00
Louis Horlaville
d974340f7a Pull request #28: Pause Menu Added 
Merge in CEGJ/32bit_jam_conjure from PauseMenu to Dev

* commit '29f95e038d93a0e0110c3a11ded8786e382f7e7c':
  Pause Menu Added
 2022-10-30 20:07:36 +00:00
louishorlaville
29f95e038d Pause Menu Added 2022-10-30 16:04:17 -04:00
Soulaha
4941b676a3 Pull request #27: fix ragdoll spacebar 
Merge in CEGJ/32bit_jam_conjure from GameLogic to Dev

* commit '3d24df4fb2ae7329b45bc3750518b440fe0c00e5':
  fix ragdoll spacebar
 2022-10-30 19:46:40 +00:00
Soulaha Balde
3d24df4fb2 fix ragdoll spacebar 2022-10-30 15:23:57 -04:00
Soulaha
bddfd3ca7d Pull request #26: Final ver of endScene 
Merge in CEGJ/32bit_jam_conjure from GameLogic to Dev

* commit 'c13d7d1883cd400ffffdbd7c14dbda4b561db545':
  Final ver of endScene
 2022-10-30 19:19:14 +00:00
Soulaha Balde
c13d7d1883 Final ver of endScene 2022-10-30 15:16:20 -04:00
Louis Horlaville
90abbd3e57 Pull request #25: MainMenu Rework 
Merge in CEGJ/32bit_jam_conjure from VolumeSlider to Dev

* commit 'a3fc68b397a846c74150ae70af29f208b0852f41':
  more windmill speed diversity
  Added Volume slider as prefab
  Polished credits and main menu
  Volume Slider up and working
  Main Menu background
 2022-10-30 15:05:01 +00: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
f40d0bcc5e Pull request #24: Coins 
Merge in CEGJ/32bit_jam_conjure from Coins to Dev

* commit 'dc38bdbdb7aa7e24770c1713c06b6c4700ae19c5':
  collected coin amount is displayed in end scene
  Collected coin amount is displayed
  Collected coin amount is tracked
  Add guiding coins Remove grapple charges
  Added collectible to recharge grapple
 2022-10-30 03:38:18 +00: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
f344527f0e Pull request #22: GameLogic 
Merge in CEGJ/32bit_jam_conjure from GameLogic to Dev

* commit '758777b8ab33d768b3bd5bc5430b03981beda8fb':
  missing in last commit
  Add ui controller fix duplicate gameControllers
 2022-10-30 00:35:35 +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
Jean Lamarre
9a920baaa7 ok visual, stop me 2022-10-29 17:30:26 -04:00
Louis Horlaville
7475e4ce73 Pull request #20: Sound addings 
Merge in CEGJ/32bit_jam_conjure from Sound to Dev

* commit '46946fd0282ea4864792a126c722250824045ce9':
  Add music and ambiance prefabs with temp music file
  Added sounds to player scripts
 2022-10-29 21:21:18 +00:00
louishorlaville
46946fd028 Add music and ambiance prefabs with temp music file 2022-10-29 17:13:40 -04:00
louishorlaville
4b36c99d8e Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into Sound 2022-10-29 17:06:11 -04:00