TheDaringDan
523926b4ec
Merge branch 'main' into music
2022-05-15 15:10:08 -04:00
860ed467b0
Fixed problems due to textmeshpro font
2022-05-15 15:01:17 -04:00
naomi-rc
264797d801
add prefabs for alerts
2022-05-15 14:52:27 -04:00
naomi-rc
3b412d8bff
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20
2022-05-15 14:45:58 -04:00
naomi-rc
789e474b64
start of high scores
2022-05-15 14:45:13 -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
Soulaha Balde
61cf67f7bf
Merge remote-tracking branch 'origin/main' into Soulaha
2022-05-15 13:59:51 -04:00
Soulaha Balde
ee5fe3d613
Merge remote-tracking branch 'origin/main' into Soulaha
2022-05-15 13:55:59 -04:00
louishorlaville
509efc9755
forgor to save oops
2022-05-15 13:53:42 -04:00
Soulaha Balde
b93deec12c
revamp main menu
...
Add tmp extras
2022-05-15 13:46:58 -04:00
louishorlaville
1e575d842c
dimension enemies separated
2022-05-15 13:40:08 -04:00
louishorlaville
9bb1e6a985
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis
2022-05-15 13:38:30 -04:00
misabiko
ec52c18cef
Merge branch 'main' into jason
...
# Conflicts:
# Assets/Scripts/WorldSwitcher.cs
2022-05-15 13:35:23 -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
Soulaha Balde
0e3f108594
fix reticle alignement
2022-05-15 12:31:54 -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
misabiko
57c9a8f643
Fixed quad height
2022-05-15 11:54:02 -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
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
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
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-rc
92ab55aef1
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20
2022-05-15 00:59:47 -04: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
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
