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

116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
louishorlaville
a680c5bf39 Main Menu background 2022-10-29 21:36:56 -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
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
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
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
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
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
craftwill
dd60346aaa Level1 basic 3D models integration 2022-10-28 20:04:39 -04:00
Alain Abboud
3aecbd1d59 Level2 partially done 2022-10-28 19:59:29 -04:00
William Gingras 01
6fd4f13496 Pull request #13: Added prefabs for: DungeonWalls, Rocks, Thief, DungeonProps 
Merge in CEGJ/32bit_jam_conjure from unpack3dModels to Dev

* commit '599735ca72f8c222def97ca03081a58d05228ac2':
  Added prefabs for: DungeonWalls, Rocks, Thief, DungeonProps
 2022-10-28 23:04:06 +00:00
craftwill
599735ca72 Added prefabs for: DungeonWalls, Rocks, Thief, DungeonProps 2022-10-28 18:53:23 -04:00
Alain Abboud (Lingito / Swifty)
1f2d1d02e8 Pull request #12: Level 1 completed 
Merge in CEGJ/32bit_jam_conjure from Level2 to Dev

* commit 'a614eeef0ac6d442de2af2651d7e4f3bef5c21ab':
  Level 1 completed
 2022-10-28 22:35:20 +00:00
Alain Abboud
a614eeef0a Level 1 completed 2022-10-28 18:30:32 -04:00
William Gingras 01
4289cb720a Pull request #11: Heads/origin/LevelDesign 
Merge in CEGJ/32bit_jam_conjure from heads/origin/LevelDesign to Dev

* commit 'e59b2cd7084930d8b96ebfddf619ea45e6f2ffef':
  Level1 changed
  Level prefabs
  Première zone terminée, mouvement ajusté
  Models
  First Level design
 2022-10-28 22:03:35 +00:00
Alain Abboud
e59b2cd708 Level1 changed 2022-10-28 17:59:25 -04:00
Guillaume Langlois 03
c8b87eb04c Pull request #10: Ragdoll 
Merge in CEGJ/32bit_jam_conjure from Ragdoll to Dev

* commit '65835ffdfa0847b2a57e557d330e4df8d089b367':
  Added Radoll script with example
 2022-10-28 21:49:13 +00:00
Alain Abboud
f1bd3d4d16 Level prefabs 2022-10-28 17:48:55 -04:00
Soulaha Balde
1690b969ac Can go from main menu to game and end game 2022-10-27 21:39:34 -04:00
Soulaha Balde
603ef2f51f singleton game controller 2022-10-27 21:16:34 -04:00
Alain Abboud
df13db7a9f Première zone terminée, mouvement ajusté 2022-10-27 01:30:18 -04:00
Alain Abboud
0d86a0a5e0 Merge remote-tracking branch 'origin/Dev' into origin/LevelDesign 2022-10-27 00:21:43 -04:00
Alain Abboud
098d4884a9 Merge remote-tracking branch 'origin/dev' into origin/LevelDesign 2022-10-27 00:05:05 -04:00
louishorlaville
4f049341ae Reduced movement speed Player 2022-10-24 22:51:57 -04:00
Soulaha Balde
a2ad4a99d2 Added obj spawner 2022-10-24 22:06:38 -04:00
louishorlaville
709aad20f0 Added Speed Control to CharacterMovement 2022-10-24 22:04:08 -04:00
Yumahey
793e01c143 Models 2022-10-24 21:42:06 -04:00
Guillaume Langlois
65835ffdfa Merge branch 'Dev' into Ragdoll 2022-10-24 02:56:16 -04:00
Guillaume Langlois
fce5869bf8 Added Radoll script with example 2022-10-24 02:56:02 -04:00
Alain Abboud
97c8f44592 First Level design 2022-10-24 00:46:50 -04:00
Soulaha
ede5429ff8 Pull request #9: Obstacles 
Merge in CEGJ/32bit_jam_conjure from Obstacles to Dev

* commit '8727aaceaa702b8efe0f762e43f92f5be06f8ddf':
  fix vanish unhook
  Rotator exist but cant go fast for collisions
  Added rotating object
  added magnitude to Vanisher inspector
  Shake obj before vanish
  Created vanish prefab
  Obj can vanish and reappear on interaction
  Added a blow zone
  Create path tracing prefab
 2022-10-24 01:36:46 +00:00
Soulaha Balde
8727aaceaa fix vanish unhook 2022-10-23 21:16:49 -04:00