Alain Abboud
e59b2cd708
Level1 changed
2022-10-28 17:59:25 -04:00
Alain Abboud
f1bd3d4d16
Level prefabs
2022-10-28 17:48:55 -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
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
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