Conjure/creative-jam-20
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 5b457ef5ae Pull request #22: Soulaha Soulaha 2022-05-15 16:09:11 +00:00
  • ce8a5ea092 Merge remote-tracking branch 'origin/main' into Soulaha Soulaha Balde 2022-05-15 12:06:17 -04:00
  • 8a06ca01a4 Pull request #21: fixed gamemanager Louis Horlaville 2022-05-15 16:04:59 +00:00
  • 0657b8a223 fixed gamemanager louishorlaville 2022-05-15 12:04:19 -04:00
  • 9a4f2771c0 Merge remote-tracking branch 'origin/main' into Soulaha Soulaha Balde 2022-05-15 11:57:06 -04:00
  • 6ff9007a1d Pull request #20: Louis Louis Horlaville 2022-05-15 15:54:40 +00:00
  • 57c9a8f643 Fixed quad height misabiko 2022-05-15 11:54:02 -04:00
  • e3e73bf64f lfs pull louishorlaville 2022-05-15 11:53:53 -04:00
  • 52bd27651e resolved merge conflict louishorlaville 2022-05-15 11:52:52 -04:00
  • d51b42a22d dimension swap integration louishorlaville 2022-05-15 11:42:18 -04:00
  • f308098371 Pull request #19: Added 3 enemies with animations William Gingras 01 2022-05-15 15:30:09 +00:00
  • b50e9a50e5 Pull request #18: Enemies now have HP values DaringDan 2022-05-15 15:29:41 +00:00
  • 3843cad7e4 Merge branch 'main' into art/enemies craftwill 2022-05-15 11:29:20 -04:00
  • 989f2ef6fc Enemies now have HP values enemyHP TheDaringDan 2022-05-15 11:28:52 -04:00
  • 8f77aecc17 Added 3 enemies with animations craftwill 2022-05-15 11:28:33 -04:00
  • d9739345cf Merge remote-tracking branch 'origin/main' into Soulaha Soulaha Balde 2022-05-15 11:14:39 -04:00
  • e1fff99f83 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-15 11:12:48 -04:00
  • 5d76eabf3c removed useless event system louishorlaville 2022-05-15 11:12:26 -04:00
  • b40f860650 Pull request #17: Locking render textures to current dimension layer Jason Durand 01 2022-05-15 15:09:51 +00:00
  • a6591839dd fixed enemy death overtime louishorlaville 2022-05-15 11:07:15 -04:00
  • dea51e54f2 Remove pause menu was already done Soulaha Balde 2022-05-15 11:06:52 -04:00
  • f6fd5798b2 Locking render textures to current dimension layer misabiko 2022-05-15 11:03:25 -04:00
  • e6fa39fb67 Rework hitscaning on cannon fire Soulaha Balde 2022-05-15 10:05:34 -04:00
  • c7f780a70b re-add enemy alert (for a single dimension) naomi-rc 2022-05-15 02:02:49 -04:00
  • 686e543b56 Pull request #16: Add Pause and Restart Menu Naomi Catwell 2022-05-15 05:17:12 +00:00
  • 7a572b6bfb fix unpause when going to main menu PauseRestartMenu naomi-rc 2022-05-15 01:14:44 -04:00
  • dea031f804 updated turret model in prefab louishorlaville 2022-05-15 01:04:25 -04:00
  • 92ab55aef1 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 naomi-rc 2022-05-15 00:59:47 -04:00
  • b49d74c938 Pull request #15: Louis Louis Horlaville 2022-05-15 04:58:19 +00:00
  • 4e3658bed6 changed cursor louishorlaville 2022-05-15 00:57:38 -04:00
  • f2d23d6a40 added restart option to menu PauseMenu naomi-rc 2022-05-15 00:54:33 -04:00
  • b0e8389598 added pause menu naomi-rc 2022-05-15 00:43:11 -04:00
  • fbd116e90b added pause menu naomi-rc 2022-05-15 00:42:34 -04:00
  • ce40e2c79a Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-15 00:01:01 -04:00
  • a20fa0000b added game scene and explosion particle system louishorlaville 2022-05-15 00:00:48 -04:00
  • ba99bbb4f0 Add MainMenu and pause menu Transitions between menus work Soulaha Balde 2022-05-14 23:16:48 -04:00
  • 7fe6cc9948 Pull request #14: Jason Jason Durand 01 2022-05-15 02:09:15 +00:00
  • 6a8b37bf05 Added mainmenu Soulaha Balde 2022-05-14 22:02:41 -04:00
  • 20de27e0a4 Kinda ok ish looking transition! misabiko 2022-05-14 22:01:45 -04:00
  • 758c2d8285 Pull request #13: Art/all3Dimensions William Gingras 01 2022-05-15 00:36:17 +00:00
  • 7d47f670dc all 3 dimensions with their volumes and skyboxes (more details will be added later) craftwill 2022-05-14 20:33:14 -04:00
  • 22204194d7 Among else, fixed determined aspect ratio misabiko 2022-05-14 19:55:14 -04:00
  • b92a798be0 resolved merge conflict louishorlaville 2022-05-14 19:10:15 -04:00
  • 552a049085 clean up test scene and trying to debug raycast louishorlaville 2022-05-14 19:08:08 -04:00
  • d21ac6edfb Added canon for dimension 1 craftwill 2022-05-14 18:36:19 -04:00
  • 2b9542c689 Merge branch 'main' into art/all3Dimensions craftwill 2022-05-14 18:11:28 -04:00
  • 84e6cba421 added final art scene craftwill 2022-05-14 18:10:39 -04:00
  • fa3eeb2e3f Pull request #12: Soulaha Soulaha 2022-05-14 21:48:25 +00:00
  • 77924dda40 correct bullet speed Soulaha Balde 2022-05-14 17:46:40 -04:00
  • ff0d2aaf43 Merge branch 'main' into Soulaha Soulaha Balde 2022-05-14 17:38:40 -04:00
  • 338a670918 Added bullet amount upgrade Soulaha Balde 2022-05-14 17:37:08 -04:00
  • e69bc1136a replace alert icon CEGJCJ20-7-alert-for-attack-on-other-worlds naomi-rc 2022-05-14 17:36:37 -04:00
  • 53d4b02ac8 Pull request #11: LossCondition DaringDan 2022-05-14 20:58:04 +00:00
  • 9992e0955c Disabling controls works LossCondition TheDaringDan 2022-05-14 16:50:23 -04:00
  • 8594123f60 OnHover upgrades btn display "purchase" ui appears Soulaha Balde 2022-05-14 16:25:03 -04:00
  • 43f2114a49 Merge branch 'main' into jason misabiko 2022-05-14 16:09:22 -04:00
  • 9c1d0427c0 Uhm, progress on transition, -ish? misabiko 2022-05-14 16:09:09 -04:00
  • b8abd15fd2 Added trail for better feel on bullets Bullets come out of cannon barrel Soulaha Balde 2022-05-14 16:05:45 -04:00
  • 09c6fc05d9 Game Loop V1 TheDaringDan 2022-05-14 16:04:31 -04:00
  • 255e08eab2 Pull request #10: Soulaha Soulaha 2022-05-14 19:54:29 +00:00
  • 8d9f3f61b9 Added btn w/ new canvas Soulaha Balde 2022-05-14 15:50:57 -04:00
  • b68b4fb156 modified assets naomi-rc 2022-05-14 14:26:26 -04:00
  • f1b528f235 Merge branch 'main' into Soulaha Soulaha Balde 2022-05-14 14:25:01 -04:00
  • 2813c6c8e3 functional alert system naomi-rc 2022-05-14 14:19:18 -04:00
  • 6a11cfef7f Pull request #9: Louis Louis Horlaville 2022-05-14 18:17:16 +00:00
  • 95834a347b cleaned up console louishorlaville 2022-05-14 14:16:30 -04:00
  • 7dfeee5359 Added dmg and fire rate upgrades w/ btns Soulaha Balde 2022-05-14 14:13:57 -04:00
  • f12a506e9e Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-14 14:11:06 -04:00
  • 1a002a713d added flying enemies and onhit raycast to destroy enemies louishorlaville 2022-05-14 14:09:46 -04:00
  • fb947608e9 Pull request #7: Art/setupDimension1 William Gingras 01 2022-05-14 17:55:34 +00:00
  • e0d226cf74 Added canvas_UI prefab with some elements already implemented craftwill 2022-05-14 13:52:50 -04:00
  • 961fa91133 Fix materials folder wrong meta file craftwill 2022-05-14 13:14:58 -04:00
  • 8bd51353fc Pull request #6: Louis Louis Horlaville 2022-05-14 14:14:41 +00:00
  • 3f5fbfe1e1 Trying to sync UI tabs to transition misabiko 2022-05-14 09:47:57 -04:00
  • 247a14a5bc Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-14 09:41:44 -04:00
  • f0348459b6 Merge branch 'main' into jason misabiko 2022-05-14 02:06:29 -04:00
  • 90822428af Prototyping camera transition misabiko 2022-05-14 02:05:50 -04:00
  • 0a88803604 Pull request #5: Soulaha Soulaha 2022-05-14 05:57:41 +00:00
  • 872fb4de74 Merge remote-tracking branch 'origin/main' into Soulaha Soulaha Balde 2022-05-14 01:52:11 -04:00
  • 197674fc1b Fix warping on cannon WIP Ammo types skeleton Soulaha Balde 2022-05-14 01:41:55 -04:00
  • 7f18c76d4b Add firerate and possible to hold down btn to fire Soulaha Balde 2022-05-14 01:25:42 -04:00
  • 645ba526df added spawn manager, enemy, and enemy spawn animation louishorlaville 2022-05-14 00:52:00 -04:00
  • 9c5bde79d6 Pull request #4: Art/setupDimension1 William Gingras 01 2022-05-14 03:22:10 +00:00
  • 0ced9716a5 Test turret in art scene craftwill 2022-05-13 23:20:41 -04:00
  • eef3a76c35 Merge branch 'main' into art/setupDimension1 craftwill 2022-05-13 23:09:51 -04:00
  • 392b9578d9 Pull request #3: Soulaha Soulaha 2022-05-14 03:08:02 +00:00
  • 0e76928816 Merge remote-tracking branch 'origin/main' into Soulaha Soulaha Balde 2022-05-13 23:06:01 -04:00
  • e797afc077 Put skyboxes into lfs Art folder craftwill 2022-05-13 23:04:38 -04:00
  • 2db3485f81 progress on dimension1 planet look craftwill 2022-05-13 23:02:07 -04:00
  • fff4b8afbc Cannon follows cursor/fires projectile on click Soulaha Balde 2022-05-13 23:01:23 -04:00
  • 5d23c09942 stage materials louishorlaville 2022-05-13 23:00:55 -04:00
  • 2331d5f84e Pull request #2: Fixed renderer type to 3D and created art scene and cleaned unseless scenes William Gingras 01 2022-05-14 01:46:43 +00:00
  • 3b15bbd152 Fixed renderer type to 3D and created art scene and cleaned unseless scenes craftwill 2022-05-13 21:44:36 -04:00
  • 9b08f86013 init branch Soulaha Balde 2022-05-13 21:12:31 -04:00
  • 0e360684be Pull request #1: Fixed folder structure problem and added content in template scene (problems with 2D renderer) William Gingras 01 2022-05-14 01:11:08 +00:00
  • dc864d3b7a Fixed folder structure problem and added content in template scene (problems with 2D renderer) craftwill 2022-05-13 21:09:09 -04:00
  • 847159cced Initial commit misabiko 2022-05-13 17:51:57 -04:00