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

49 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jean Lamarre
97facc06fd Merge branch 'master' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into UI-MainMenu 2022-10-17 12:07:12 -04:00
Jean Lamarre 01
2984c76dd5 Pull request #2: addded tmp 
Merge in CEGJ/32bit_jam_conjure from TMP to master

* commit 'f8bd21101d7b1b52a7e5c2aff403e1946b3e7c57':
  addded tmp
 2022-10-17 16:06:41 +00:00
Jean Lamarre
f8bd21101d addded tmp 2022-10-17 12:05:46 -04:00
Jean Lamarre
954d089fa3 Tiled test 2022-10-17 12:04:26 -04:00
Jean Lamarre
0bb5f15109 testSprite 2022-10-17 12:03:14 -04:00
Jean Lamarre 01
4e58c1783c Pull request #1: Add main scene and new input system 
Merge in CEGJ/32bit_jam_conjure from InputSystem to master

* commit '2ff07ca50cd5f99e54a814e74472c6999238967e':
  Add main scene and new input system
 2022-10-17 16:00:52 +00:00
Jean Lamarre
2ff07ca50c Add main scene and new input system 2022-10-17 11:33:39 -04:00
Yumahey
0fe9882f8f gitignore .vscode folder 2022-10-16 19:34:25 -04:00
Jean Lamarre
78799ac51a remove tutorial info 2022-10-16 19:16:33 -04:00
Jean Lamarre
7db1f2cb05 ignore 2022-10-16 19:15:38 -04:00
Jean Lamarre
6cae3f47fe ignore .idea and .vs 2022-10-16 19:15:14 -04:00
Jean Lamarre
1964b5af14 Merge branch 'init-project' 2022-10-16 19:04:46 -04:00
Jean Lamarre
653e970336 Revert "remove gitattribute" 
This reverts commit 83c29567496fad60274ff35e5683ab78ac46b21c.
 2022-10-16 19:03:40 -04:00
Jean Lamarre
83c2956749 remove gitattribute 2022-10-16 19:00:46 -04:00
Jean Lamarre
c7cc75108d remove gitattributte 2022-10-16 18:58:29 -04:00
Jean Lamarre
a882e9f1d9 settings unity 2022-10-16 18:57:37 -04:00
Jean Lamarre
2ceef3c9e5 unity init 2022-10-16 18:49:46 -04:00
Jean Lamarre
30b24c5ffd gitattribute 2022-10-16 18:26:29 -04:00
Jean Lamarre
114c4b6c98 gitignore 2022-10-16 18:25:05 -04:00