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
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
dd60346aaa
Level1 basic 3D models integration
2022-10-28 20:04:39 -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
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
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
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
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
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
