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

68 Commits

Author SHA1 Message Date
louishorlaville
a680c5bf39 Main Menu background 2022-10-29 21:36:56 -04:00
louishorlaville
46946fd028 Add music and ambiance prefabs with temp music file 2022-10-29 17:13:40 -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
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
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
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
Yumahey
557d395d7e Level graphical rework 2022-10-29 11:56:08 -04:00
Alain Abboud
3aecbd1d59 Level2 partially done 2022-10-28 19:59:29 -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
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
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 Balde
b50661c8d3 Rotator exist but cant go fast for collisions 2022-10-23 21:13:28 -04:00
Soulaha Balde
e3138296c8 Added rotating object 2022-10-23 19:38:29 -04:00
Soulaha Balde
588640b61e added magnitude to Vanisher inspector 2022-10-23 18:39:16 -04:00
Soulaha Balde
b57f51cfb5 Obj can vanish and reappear on interaction 2022-10-23 15:49:05 -04:00
Soulaha Balde
eb1c9acdea Added a blow zone 2022-10-23 15:08:50 -04:00
Soulaha Balde
bde9e991fd Create path tracing prefab 2022-10-23 12:44:41 -04:00
Soulaha Balde
0dd2e58915 Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into Dev 2022-10-23 12:33:16 -04:00
Soulaha Balde
2416b70c2c A obj can trace a path, and loop or reverse 2022-10-23 12:32:40 -04:00
louishorlaville
903a2e443d Fixed Player jump 2022-10-22 21:08:34 -04:00
Soulaha Balde
6b5c481c6f Trigger zone can trigger triggerable obj 
Example in SlidingDoor in Obstacle scene
 2022-10-21 23:25:18 -04:00
Soulaha Balde
beafdf2078 Stuns can knockback player in chosen dir 2022-10-21 22:23:21 -04:00
Soulaha Balde
fd9cee838c Moved stun logic to obj instead of player 2022-10-21 21:55:05 -04:00
Soulaha Balde
b9777f7a62 Colliding with certain obj can stun the player 2022-10-21 21:30:19 -04:00
Soulaha Balde
babbc78b4f MErge into dev scene 2022-10-21 20:38:57 -04:00
Soulaha Balde
739ab57760 Create initial player prefab 2022-10-21 17:06:19 -04:00
Soulaha Balde
39283354c1 Grapple uses new input system 2022-10-21 16:12:21 -04:00
Louis Horlaville
c21f388eca Pull request #6: tweaked rigidbody values and jump mechanic, still incomplete tho 
Merge in CEGJ/32bit_jam_conjure from CharacterMovement to Dev

* commit '740f2351607a131ad5ec5a6f7bdc496e01aec52f':
  tweaked rigidbody values and jump mechanic, still incomplete tho
 2022-10-20 03:50:22 +00:00
louishorlaville
740f235160 tweaked rigidbody values and jump mechanic, still incomplete tho 2022-10-19 23:49:26 -04:00
Soulaha Balde
d665594181 added floor to grabeable layers 2022-10-19 22:57:42 -04:00
Soulaha Balde
577acaa515 merge into dev scene 2022-10-19 22:49:02 -04:00
Soulaha Balde
97176fa0de Move files around 2022-10-19 22:24:40 -04:00
Soulaha
8bc85ac731 Pull request #5: Grappling 
Merge in CEGJ/32bit_jam_conjure from grappling to Dev

* commit 'b2c581a8d53e5c8fa516a7c77953a0dc6dbf9e37':
  save scene
  Can move up and down on rope Change boosting technique
  new test area
  Change hit marker to a ui element
  Rope lerps to grapple point
  Can grapple objects with rigidbodies
  Added grapple layer mask
  Added follow camera
  Grapple moves player and is represented
  Base for grappling
 2022-10-20 02:17:54 +00:00