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

60 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
louishorlaville
4e3658bed6 changed cursor 2022-05-15 00:57:38 -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
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
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
Soulaha Balde
338a670918 Added bullet amount upgrade 2022-05-14 17:37:08 -04:00
DaringDan
53d4b02ac8 Pull request #11: LossCondition 
Merge in CEGJ/creative-jam-20 from LossCondition to main

* commit '9992e0955cf30457448f94ff7de4c8e41a2572cc':
  Disabling controls works
  Game Loop V1
 2022-05-14 20:58:04 +00:00
TheDaringDan
9992e0955c Disabling controls works 2022-05-14 16:50:23 -04:00
Soulaha Balde
8594123f60 OnHover upgrades btn display "purchase" ui appears 2022-05-14 16:25:03 -04:00
misabiko
43f2114a49 Merge branch 'main' into jason 2022-05-14 16:09:22 -04:00
misabiko
9c1d0427c0 Uhm, progress on transition, -ish? 2022-05-14 16:09:09 -04:00
Soulaha Balde
b8abd15fd2 Added trail for better feel on bullets 
Bullets come out of cannon barrel
 2022-05-14 16:05:45 -04:00
TheDaringDan
09c6fc05d9 Game Loop V1 
Controls don't deactivate yet
 2022-05-14 16:04:31 -04:00
Soulaha
255e08eab2 Pull request #10: Soulaha 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit '8d9f3f61b9034de4b93dc316dd36037160aba940':
  Added btn w/ new canvas
  Added dmg and fire rate upgrades w/ btns
 2022-05-14 19:54:29 +00:00
Soulaha Balde
8d9f3f61b9 Added btn w/ new canvas 2022-05-14 15:50:57 -04:00
Soulaha Balde
f1b528f235 Merge branch 'main' into Soulaha 2022-05-14 14:25:01 -04:00
Louis Horlaville
6a11cfef7f Pull request #9: Louis 
Merge in CEGJ/creative-jam-20 from Louis to main

* commit '95834a347b13278bf53b63324849a4812676b330':
  cleaned up console
  added flying enemies and onhit raycast to destroy enemies
 2022-05-14 18:17:16 +00:00
louishorlaville
95834a347b cleaned up console 2022-05-14 14:16:30 -04:00
Soulaha Balde
7dfeee5359 Added dmg and fire rate upgrades w/ btns 2022-05-14 14:13:57 -04:00
louishorlaville
f12a506e9e Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis 2022-05-14 14:11:06 -04:00
louishorlaville
1a002a713d added flying enemies and onhit raycast to destroy enemies 2022-05-14 14:09:46 -04:00
William Gingras 01
fb947608e9 Pull request #7: Art/setupDimension1 
Merge in CEGJ/creative-jam-20 from art/setupDimension1 to main

* commit 'e0d226cf7473b8e428bd4ed11418084fe0236cb8':
  Added canvas_UI prefab with some elements already implemented
  Fix materials folder wrong meta file
 2022-05-14 17:55:34 +00:00
craftwill
e0d226cf74 Added canvas_UI prefab with some elements already implemented 2022-05-14 13:52:50 -04:00
craftwill
961fa91133 Fix materials folder wrong meta file 2022-05-14 13:14:58 -04:00
Louis Horlaville
8bd51353fc Pull request #6: Louis 
Merge in CEGJ/creative-jam-20 from Louis to main

* commit '247a14a5bce9beecdc89c1c65fd27dc21bdd639c':
  added spawn manager, enemy, and enemy spawn animation
  stage materials
 2022-05-14 14:14:41 +00:00
misabiko
3f5fbfe1e1 Trying to sync UI tabs to transition 2022-05-14 09:47:57 -04:00
louishorlaville
247a14a5bc Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis 2022-05-14 09:41:44 -04:00
misabiko
f0348459b6 Merge branch 'main' into jason 2022-05-14 02:06:29 -04:00
misabiko
90822428af Prototyping camera transition 2022-05-14 02:05:50 -04:00
Soulaha
0a88803604 Pull request #5: Soulaha 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit '872fb4de7443e0899ab649d0a67f77ecc34a7f1d':
  Fix warping  on cannon WIP Ammo types skeleton
  Add firerate and possible to hold down btn to fire
 2022-05-14 05:57:41 +00:00
Soulaha Balde
872fb4de74 Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-14 01:52:11 -04:00
Soulaha Balde
197674fc1b Fix warping on cannon 
WIP Ammo types skeleton
 2022-05-14 01:41:55 -04:00
Soulaha Balde
7f18c76d4b Add firerate and possible to hold down btn to fire 2022-05-14 01:25:42 -04:00
louishorlaville
645ba526df added spawn manager, enemy, and enemy spawn animation 2022-05-14 00:52:00 -04:00
William Gingras 01
9c5bde79d6 Pull request #4: Art/setupDimension1 
Merge in CEGJ/creative-jam-20 from art/setupDimension1 to main

* commit '0ced9716a55f1509ebe3fcaf09547307342c1705':
  Test turret in art scene
  Put skyboxes into lfs Art folder
  progress on dimension1 planet look
 2022-05-14 03:22:10 +00:00
craftwill
0ced9716a5 Test turret in art scene 2022-05-13 23:20:41 -04:00
craftwill
eef3a76c35 Merge branch 'main' into art/setupDimension1 2022-05-13 23:09:51 -04:00
Soulaha
392b9578d9 Pull request #3: Soulaha 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit '0e76928816ec159ed46b3c5f9859f2e0d744401c':
  Cannon follows cursor/fires projectile on click
  init branch
 2022-05-14 03:08:02 +00:00
Soulaha Balde
0e76928816 Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-13 23:06:01 -04:00