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
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
d21ac6edfb
Added canon for dimension 1
2022-05-14 18:36:19 -04:00
2b9542c689
Merge branch 'main' into art/all3Dimensions
2022-05-14 18:11:28 -04:00
84e6cba421
added final art scene
2022-05-14 18:10:39 -04: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 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
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
e0d226cf74
Added canvas_UI prefab with some elements already implemented
2022-05-14 13:52:50 -04:00
961fa91133
Fix materials folder wrong meta file
2022-05-14 13:14:58 -04: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 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
0ced9716a5
Test turret in art scene
2022-05-13 23:20:41 -04:00
eef3a76c35
Merge branch 'main' into art/setupDimension1
2022-05-13 23:09:51 -04:00
Soulaha Balde
0e76928816
Merge remote-tracking branch 'origin/main' into Soulaha
2022-05-13 23:06:01 -04:00
e797afc077
Put skyboxes into lfs Art folder
2022-05-13 23:04:38 -04:00
2db3485f81
progress on dimension1 planet look
2022-05-13 23:02:07 -04:00
Soulaha Balde
fff4b8afbc
Cannon follows cursor/fires projectile on click
2022-05-13 23:01:23 -04:00
louishorlaville
5d23c09942
stage materials
2022-05-13 23:00:55 -04:00
3b15bbd152
Fixed renderer type to 3D and created art scene and cleaned unseless scenes
2022-05-13 21:44:36 -04:00
Soulaha Balde
9b08f86013
init branch
2022-05-13 21:12:31 -04:00
dc864d3b7a
Fixed folder structure problem and added content in template scene (problems with 2D renderer)
2022-05-13 21:09:09 -04:00
misabiko
847159cced
Initial commit
2022-05-13 17:51:57 -04:00
