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

169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
5b1d030d3d Shake obj before vanish 2022-10-23 18:36:32 -04:00
Soulaha Balde
b95d04923c Created vanish prefab 2022-10-23 15:50:06 -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
4effa7adb1 Removed debug log, 
pushed on dev by mistake
 2022-10-23 12:34:22 -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
79b3f8c681 Added bounce material for the player 2022-10-22 23:23:02 -04:00
louishorlaville
903a2e443d Fixed Player jump 2022-10-22 21:08:34 -04:00
Soulaha
21b87a28d3 Pull request #8: Obstacles 
Merge in CEGJ/32bit_jam_conjure from Obstacles to Dev

* commit '6b5c481c6f38e6dc695dc890ec8981c05b56fd12':
  Trigger zone can trigger triggerable obj Example in SlidingDoor in Obstacle scene
  Stuns can knockback player in chosen dir
  Moved stun logic to obj instead of player
  Colliding with certain obj can stun the player
 2022-10-22 03:30:26 +00: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
45ae623028 Pull request #7: Grapple uses new input system 
Merge in CEGJ/32bit_jam_conjure from grappling to Dev

* commit '39283354c12a522f7d6f637b848429009ff02fd4':
  Grapple uses new input system
 2022-10-21 21:02:42 +00: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
Soulaha Balde
b2c581a8d5 save scene 2022-10-19 22:16:14 -04:00
Louis Horlaville
2881e0cb42 Pull request #4: CharacterMovement 
Merge in CEGJ/32bit_jam_conjure from CharacterMovement to Dev

* commit 'c14b6e30aedb086b82b461780284b695f2392f24':
  saved scene
  Added jump and tweaked jump while walking interaction
  added small jump
  added walk and input system
 2022-10-20 02:12:21 +00:00
louishorlaville
c14b6e30ae saved scene 2022-10-19 21:56:53 -04:00
Soulaha Balde
c079a6ccba Can move up and down on rope 
Change boosting technique
 2022-10-19 21:35:22 -04:00
Soulaha Balde
5b7c6ab2e6 new test area 2022-10-19 19:42:35 -04:00
louishorlaville
f58dd0ae5b Added jump and tweaked jump while walking interaction 2022-10-19 19:38:06 -04:00
Soulaha Balde
5bbc3a40c1 Change hit marker to a ui element 2022-10-19 19:18:11 -04:00
Soulaha Balde
92be2fc57f Rope lerps to grapple point 2022-10-19 15:35:46 -04:00
Soulaha Balde
62267b6f2e Can grapple objects with rigidbodies 2022-10-19 15:14:02 -04:00
Soulaha Balde
e42f7e8f81 Added grapple layer mask 2022-10-19 11:18:36 -04:00
Soulaha Balde
a90c5c1f54 Added follow camera 2022-10-19 10:20:18 -04:00
louishorlaville
0e32c69f2a added small jump 2022-10-18 23:41:28 -04:00
louishorlaville
6d0a7912e0 added walk and input system 2022-10-18 23:28:01 -04:00
Soulaha Balde
f1e247a9ec Grapple moves player and is represented 2022-10-18 23:22:05 -04:00
Soulaha Balde
3c870ee22f Base for grappling 2022-10-18 15:17:47 -04:00
Jean Lamarre 01
f64e3df9e5 Pull request #3: UI MainMenu 
Merge in CEGJ/32bit_jam_conjure from UI-MainMenu to master

* commit '2c0005464fe86fdee28b6c7026a979157026a4f3':
  Conjure logo
  button prefab and preliminare credits
  main menu first draft
  Tiled test
  testSprite
 2022-10-17 17:27:11 +00:00
Jean Lamarre
2c0005464f Conjure logo 2022-10-17 12:39:02 -04:00
Jean Lamarre
f5cd8ae63e button prefab and preliminare credits 2022-10-17 12:25:35 -04:00
Jean Lamarre
c665f8d0a7 main menu first draft 2022-10-17 12:17:56 -04:00