TheDaringDan
|
5f0e2acdb0
|
Add first round of SFX
|
2022-05-15 16:32:27 -04:00 |
|
louishorlaville
|
d4de13aa55
|
Merge branch 'main' into Louis
|
2022-05-15 15:32:12 -04:00 |
|
louishorlaville
|
570de063c8
|
merge conflict resolved
|
2022-05-15 15:30:10 -04:00 |
|
TheDaringDan
|
cd95e1ffa1
|
Merge remote-tracking branch 'origin/main' into music
|
2022-05-15 15:24:35 -04:00 |
|
misabiko
|
25cfbf616a
|
Nudged upgrades next to tabs
|
2022-05-15 15:11:46 -04:00 |
|
TheDaringDan
|
523926b4ec
|
Merge branch 'main' into music
|
2022-05-15 15:10:08 -04:00 |
|
misabiko
|
c2e6f4b2ec
|
Merge branch 'main' into jason
|
2022-05-15 15:07:05 -04:00 |
|
misabiko
|
edc3a8d8bf
|
Added alert to dimension tab
|
2022-05-15 15:06:53 -04:00 |
|
|
|
860ed467b0
|
Fixed problems due to textmeshpro font
|
2022-05-15 15:01:17 -04:00 |
|
misabiko
|
64f7b77b35
|
Merge branch 'main' into jason
|
2022-05-15 14:53:40 -04:00 |
|
naomi-rc
|
264797d801
|
add prefabs for alerts
|
2022-05-15 14:52:27 -04:00 |
|
louishorlaville
|
cdacdf23a5
|
enemies balanced
|
2022-05-15 14:51:34 -04:00 |
|
misabiko
|
41366af70a
|
Merge branch 'main' into jason
|
2022-05-15 14:47:21 -04:00 |
|
misabiko
|
ea264b8418
|
Moving healthbars and buttons with tabs
|
2022-05-15 14:46:30 -04:00 |
|
TheDaringDan
|
58d0643ba5
|
Music integrated
Linked to Main Menu settings
|
2022-05-15 14:44:17 -04:00 |
|
|
|
51cea5fd10
|
Added gain currency animation; Added EventManager; Fixes to Dimensions prefabs
|
2022-05-15 14:43:27 -04:00 |
|
louishorlaville
|
c69ef9734e
|
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis
|
2022-05-15 13:50:38 -04:00 |
|
|
|
8f3ab61510
|
Added textmeshpro extension
|
2022-05-15 13:41:33 -04:00 |
|
louishorlaville
|
1e575d842c
|
dimension enemies separated
|
2022-05-15 13:40:08 -04:00 |
|
louishorlaville
|
b8171e1538
|
Merge branch 'main' into Louis
|
2022-05-15 13:04:35 -04:00 |
|
|
|
8c7ea4ff9f
|
HealtBars and Dimension1.prefab fix
|
2022-05-15 13:02:35 -04:00 |
|
louishorlaville
|
21ee9cae61
|
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis
|
2022-05-15 12:35:46 -04:00 |
|
louishorlaville
|
f4b87a6d6e
|
cant see enemies in different dimensions
|
2022-05-15 12:32:59 -04:00 |
|
|
|
66145b2112
|
Merge with main
|
2022-05-15 12:28:07 -04:00 |
|
|
|
d167c0e913
|
Health bars code
|
2022-05-15 12:16:03 -04:00 |
|
Soulaha Balde
|
ce8a5ea092
|
Merge remote-tracking branch 'origin/main' into Soulaha
|
2022-05-15 12:06:17 -04: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 |
|
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 |
|
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 |
|
|
|
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
|
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 |
|
Soulaha Balde
|
e6fa39fb67
|
Rework hitscaning on cannon fire
|
2022-05-15 10:05:34 -04:00 |
|
louishorlaville
|
dea031f804
|
updated turret model in prefab
|
2022-05-15 01:04:25 -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 |
|
|
|
7d47f670dc
|
all 3 dimensions with their volumes and skyboxes (more details will be added later)
|
2022-05-14 20:33: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 |
|
Soulaha Balde
|
77924dda40
|
correct bullet speed
|
2022-05-14 17:46:40 -04:00 |
|
Soulaha Balde
|
338a670918
|
Added bullet amount upgrade
|
2022-05-14 17:37:08 -04:00 |
|
Soulaha Balde
|
8594123f60
|
OnHover upgrades btn display "purchase" ui appears
|
2022-05-14 16:25:03 -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 |
|
Soulaha Balde
|
8d9f3f61b9
|
Added btn w/ new canvas
|
2022-05-14 15:50:57 -04:00 |
|
