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

146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Soulaha Balde
ba4ef9f55f Merge branch 'grappling' into Coins 2022-10-29 21:47:34 -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
louishorlaville
b924890951 Added sounds to player scripts 2022-10-29 16:48:18 -04:00
Jean Lamarre
6d9ada8b4b wip, because im losing my shit 2022-10-29 16:47:51 -04:00
Yumahey
538c133d86 Door & chandelier model 2022-10-29 16:02:58 -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
c8c7b23e1a fix CRT 2022-10-29 15:23:29 -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
54a2575703 Add unity event 2022-10-29 15:02:18 -04:00
Soulaha Balde
2f486c38eb Scene setup 2022-10-29 14:56:03 -04:00
William Gingras 01
66211085cb Pull request #17: Working ragdoll; Added sounds bytes utils 
Merge in CEGJ/32bit_jam_conjure from ragdollGucci to Dev

* commit 'c7e2ba805b4859484594ba5d31d0a8308f7d1895':
  Working ragdoll; Added sounds bytes utils
 2022-10-29 18:46:32 +00:00
craftwill
c7e2ba805b Working ragdoll; Added sounds bytes utils 2022-10-29 14:45:29 -04:00
Jean Lamarre
aea0ed7270 tune down noise shader 2022-10-29 14:04:10 -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
Jean Lamarre
f2714ac16e icon 2022-10-29 13:47:20 -04:00
William Gingras 01
6535829abd Pull request #16: More details in level and level1, added windmills 
Merge in CEGJ/32bit_jam_conjure from PolishingLevel1 to Dev

* commit 'aac756a05fbd4da5644d2ee4f3c34326d98402ce':
  More details in level and level1, added windmills
 2022-10-29 17:41:47 +00: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 (Lingito / Swifty)
d51cb23741 Pull request #15: Level2 
Merge in CEGJ/32bit_jam_conjure from Level2 to Dev

* commit 'b0a45120714a6a35398e420061200e7861e31f10':
  Level 2 finished
  Level2 partially done
 2022-10-29 17:28:18 +00: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
William Gingras 01
41b74ee026 Pull request #14: Level1 basic 3D models integration 
Merge in CEGJ/32bit_jam_conjure from Level1 to Dev

* commit '4bf5f8692697faf62efcf5a21d53a373151cc4c1':
  Added background back, but its easier to see the level elements now
  Level graphical rework
  Level1 basic 3D models integration
 2022-10-29 16:27:55 +00:00
craftwill
4bf5f86926 Added background back, but its easier to see the level elements now 2022-10-29 12:27:07 -04:00
Yumahey
557d395d7e Level graphical rework 2022-10-29 11:56:08 -04:00
Jean Lamarre
113ec2dffd Revert "Level1 basic 3D models integration" 
This reverts commit dd60346aaa49c5dc2cb3ed72546919fa63e01e59.
 2022-10-29 05:15:27 -04:00
Jean Lamarre
5e7a9ed899 trying to fix UI broken a bit 2022-10-29 05:14:57 -04:00
Jean Lamarre
da6500e9bc Merge branch 'Retro-Visual' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into Level1-wShader 2022-10-29 03:55:59 -04:00