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

146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean Lamarre
d4eb08d7ed fix menu UI cassé a cause Shader + fineTouch 2022-10-29 03:54:34 -04:00
Jean Lamarre
f4cad8a5c5 Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into Retro-Visual 2022-10-29 03:13:41 -04:00
Jean Lamarre
56cff00ba5 quite good i think 2022-10-29 03:12:54 -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
Jean Lamarre
d0ebab4643 wip shaders!! 2022-10-28 15:54:00 -04:00
Jean Lamarre
3dc83774af wip visual #learningstuff 2022-10-28 14:41:09 -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
Soulaha Balde
76a7333455 Added collectible to recharge grapple 2022-10-24 19:58:29 -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