Conjure/creative-jam-20
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
194 Commits 11 Branches 0 Tags
Commit Graph

194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Soulaha
5b457ef5ae Pull request #22: Soulaha 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit 'ce8a5ea092dfabb9016f47347ac4880cd3543987':
  Remove pause menu was already done
  Rework hitscaning on cannon fire
  Add MainMenu and pause menu Transitions between menus work
  Added mainmenu
 2022-05-15 16:09:11 +00:00
Soulaha Balde
ce8a5ea092 Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-15 12:06:17 -04:00
Louis Horlaville
8a06ca01a4 Pull request #21: fixed gamemanager 
Merge in CEGJ/creative-jam-20 from Louis to main

* commit '0657b8a2237c6a3d73119b55316426326d8fedc5':
  fixed gamemanager
 2022-05-15 16:04:59 +00:00
louishorlaville
0657b8a223 fixed gamemanager 2022-05-15 12:04:19 -04:00
Soulaha Balde
9a4f2771c0 Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-15 11:57:06 -04:00
Louis Horlaville
6ff9007a1d Pull request #20: Louis 
Merge in CEGJ/creative-jam-20 from Louis to main

* commit 'e3e73bf64f34ae459dfcaf081b726bf4f51fc59a':
  lfs pull
  dimension swap integration
  removed useless event system
  fixed enemy death overtime
  updated turret model in prefab
 2022-05-15 15:54:40 +00:00
misabiko
57c9a8f643 Fixed quad height 2022-05-15 11:54:02 -04:00
louishorlaville
e3e73bf64f lfs pull 2022-05-15 11:53:53 -04:00
louishorlaville
52bd27651e resolved merge conflict 2022-05-15 11:52:52 -04:00
louishorlaville
d51b42a22d dimension swap integration 2022-05-15 11:42:18 -04:00
William Gingras 01
f308098371 Pull request #19: Added 3 enemies with animations 
Merge in CEGJ/creative-jam-20 from art/enemies to main

* commit '3843cad7e4918be4d6531bb602dffd97a7cddd11':
  Added 3 enemies with animations
 2022-05-15 15:30:09 +00:00
DaringDan
b50e9a50e5 Pull request #18: Enemies now have HP values 
Merge in CEGJ/creative-jam-20 from enemyHP to main

* commit '989f2ef6fca390ab45b270b58013efd0cb1663ca':
  Enemies now have HP values
 2022-05-15 15:29:41 +00:00
craftwill
3843cad7e4 Merge branch 'main' into art/enemies 2022-05-15 11:29:20 -04:00
TheDaringDan
989f2ef6fc Enemies now have HP values 
They give points on destruction
Points update on UI based on GameManager info
 2022-05-15 11:28:52 -04:00
craftwill
8f77aecc17 Added 3 enemies with animations 2022-05-15 11:28:33 -04:00
Soulaha Balde
d9739345cf Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-15 11:14:39 -04:00
louishorlaville
e1fff99f83 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis 2022-05-15 11:12:48 -04:00
louishorlaville
5d76eabf3c removed useless event system 2022-05-15 11:12:26 -04:00
Jason Durand 01
b40f860650 Pull request #17: Locking render textures to current dimension layer 
Merge in CEGJ/creative-jam-20 from jason to main

* commit 'f6fd5798b2b2da1683929c9ef5ba84ff7134adf1':
  Locking render textures to current dimension layer
 2022-05-15 15:09:51 +00:00
louishorlaville
a6591839dd fixed enemy death overtime 2022-05-15 11:07:15 -04:00
Soulaha Balde
dea51e54f2 Remove pause menu was already done 2022-05-15 11:06:52 -04:00
misabiko
f6fd5798b2 Locking render textures to current dimension layer 2022-05-15 11:03:25 -04:00
Soulaha Balde
e6fa39fb67 Rework hitscaning on cannon fire 2022-05-15 10:05:34 -04:00
naomi-rc
c7f780a70b re-add enemy alert (for a single dimension) 2022-05-15 02:02:49 -04:00
Naomi Catwell
686e543b56 Pull request #16: Add Pause and Restart Menu 
Merge in CEGJ/creative-jam-20 from PauseRestartMenu to main

* commit '7a572b6bfb15f6522eb6bc5954249c3f939b59c8':
  fix unpause when going to main menu
  added restart option to menu
  added pause menu
  added pause menu
 2022-05-15 05:17:12 +00:00
naomi-rc
7a572b6bfb fix unpause when going to main menu 2022-05-15 01:14:44 -04:00
louishorlaville
dea031f804 updated turret model in prefab 2022-05-15 01:04:25 -04:00
naomi-rc
92ab55aef1 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 2022-05-15 00:59:47 -04:00
Louis Horlaville
b49d74c938 Pull request #15: Louis 
Merge in CEGJ/creative-jam-20 from Louis to main

* commit '4e3658bed6772d5eca5d93eca10e1431776f0438':
  changed cursor
  added game scene and explosion particle system
  clean up test scene and trying to debug raycast
 2022-05-15 04:58:19 +00:00
louishorlaville
4e3658bed6 changed cursor 2022-05-15 00:57:38 -04:00
naomi-rc
f2d23d6a40 added restart option to menu 2022-05-15 00:54:33 -04:00
naomi-rc
b0e8389598 added pause menu 2022-05-15 00:43:11 -04:00
naomi-rc
fbd116e90b added pause menu 2022-05-15 00:42:34 -04:00
louishorlaville
ce40e2c79a Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis 2022-05-15 00:01:01 -04:00
louishorlaville
a20fa0000b added game scene and explosion particle system 2022-05-15 00:00:48 -04:00
Soulaha Balde
ba99bbb4f0 Add MainMenu and pause menu 
Transitions between menus work
 2022-05-14 23:16:48 -04:00
Jason Durand 01
7fe6cc9948 Pull request #14: Jason 
Merge in CEGJ/creative-jam-20 from jason to main

* commit '20de27e0a46e8b8403eba201a05be4b3aeaf3bed':
  Kinda ok ish looking transition!
  Among else, fixed determined aspect ratio
  Uhm, progress on transition, -ish?
  Trying to sync UI tabs to transition
  Prototyping camera transition
 2022-05-15 02:09:15 +00:00
Soulaha Balde
6a8b37bf05 Added mainmenu 2022-05-14 22:02:41 -04:00
misabiko
20de27e0a4 Kinda ok ish looking transition! 2022-05-14 22:01:45 -04:00
William Gingras 01
758c2d8285 Pull request #13: Art/all3Dimensions 
Merge in CEGJ/creative-jam-20 from art/all3Dimensions to main

* commit '7d47f670dcb6055e565da11906d18f7a7ecb6e14':
  all 3 dimensions with their volumes and skyboxes (more details will be added later)
  Added canon for dimension 1
  added final art scene
 2022-05-15 00:36:17 +00:00
craftwill
7d47f670dc all 3 dimensions with their volumes and skyboxes (more details will be added later) 2022-05-14 20:33:14 -04:00
misabiko
22204194d7 Among else, fixed determined aspect ratio 2022-05-14 19:55:14 -04:00
louishorlaville
b92a798be0 resolved merge conflict 2022-05-14 19:10:15 -04:00
louishorlaville
552a049085 clean up test scene and trying to debug raycast 2022-05-14 19:08:08 -04:00
craftwill
d21ac6edfb Added canon for dimension 1 2022-05-14 18:36:19 -04:00
craftwill
2b9542c689 Merge branch 'main' into art/all3Dimensions 2022-05-14 18:11:28 -04:00
craftwill
84e6cba421 added final art scene 2022-05-14 18:10:39 -04:00
Soulaha
fa3eeb2e3f Pull request #12: Soulaha 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit '77924dda40cfd34aafd794dc4b27a125679a14da':
  correct bullet speed
  Added bullet amount upgrade
  OnHover upgrades btn display "purchase" ui appears
  Added trail for better feel on bullets Bullets come out of cannon barrel
 2022-05-14 21:48:25 +00:00
Soulaha Balde
77924dda40 correct bullet speed 2022-05-14 17:46:40 -04:00
Soulaha Balde
ff0d2aaf43 Merge branch 'main' into Soulaha 2022-05-14 17:38:40 -04:00