Soulaha Balde
d7c3b41189
Fix invisble bullets
2022-05-15 17:14:45 -04:00
Soulaha Balde
35cbd78568
Merge remote-tracking branch 'origin/main' into Soulaha
2022-05-15 16:54:39 -04:00
Louis Horlaville
85e40c173a
Pull request #40 : Louis
...
Merge in CEGJ/creative-jam-20 from Louis to main
* commit '7e7b3a45a0226f62f7989d720184846d2f921128':
fixed post merge
particles on hit planet
hit feedback particles
2022-05-15 20:51:28 +00:00
Soulaha Balde
b40000c70b
Add gameover screen
2022-05-15 16:50:07 -04:00
louishorlaville
7e7b3a45a0
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis
2022-05-15 16:48:57 -04:00
louishorlaville
d3cc49b66e
fixed post merge
2022-05-15 16:48:39 -04:00
TheDaringDan
b066a1b2a2
Merge remote-tracking branch 'origin/main' into main
2022-05-15 16:48:05 -04:00
TheDaringDan
c1da237e8a
Cannon Shoot SFX
2022-05-15 16:48:00 -04:00
louishorlaville
3d68c0159a
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis
2022-05-15 16:42:30 -04:00
louishorlaville
094bcf9dd6
merge conflicts resolved
2022-05-15 16:42:09 -04:00
Jason Durand 01
219067dbb3
Pull request #39 : Disable compression and set WebGL layout to minimal
...
Merge in CEGJ/creative-jam-20 from jason to main
* commit '7f849d6e699c7100f0bc540d9fe01dd87158841f':
Disable compression and set WebGL layout to minimal
2022-05-15 20:39:41 +00:00
misabiko
7f849d6e69
Merge branch 'main' into jason
2022-05-15 16:39:20 -04:00
louishorlaville
f61dbb9edd
particles on hit planet
2022-05-15 16:37:14 -04:00
misabiko
f015f3f5a8
Disable compression and set WebGL layout to minimal
2022-05-15 16:36:06 -04:00
DaringDan
b7197e7807
Pull request #38 : Add first round of SFX
...
Merge in CEGJ/creative-jam-20 from sfx to main
* commit '5f0e2acdb03a22613fd200fa0ac9c4df33965c8d':
Add first round of SFX
2022-05-15 20:33:50 +00:00
TheDaringDan
5f0e2acdb0
Add first round of SFX
2022-05-15 16:32:27 -04:00
louishorlaville
14f3a2dda5
hit feedback particles
2022-05-15 16:25:30 -04:00
Jason Durand 01
34ab392616
Pull request #37 : Adding 123 hotkeys
...
Merge in CEGJ/creative-jam-20 from jason to main
* commit 'c2145b8940fe97ae1bc954314229c42b4a9c9ab7':
Adding 123 hotkeys
2022-05-15 20:17:47 +00:00
misabiko
c2145b8940
Merge branch 'main' into jason
2022-05-15 16:17:04 -04:00
misabiko
d2abe4d215
Adding 123 hotkeys
2022-05-15 16:16:11 -04:00
Jason Durand 01
2f7c894a93
Pull request #36 : Much better color format for render textures
...
Merge in CEGJ/creative-jam-20 from jason to main
* commit '90207c5b47b8af9ba824b32ee1f9ca10d73fff25':
Much better color format for render textures
2022-05-15 20:04:53 +00:00
misabiko
90207c5b47
Merge branch 'main' into jason
2022-05-15 16:02:39 -04:00
Louis Horlaville
919825e10d
Pull request #35 : changed starting spawns to dimension 2
...
Merge in CEGJ/creative-jam-20 from Louis to main
* commit '4310b55ab1c9ea548f282d8b6b3ead6948a35612':
changed starting spawns to dimension 2
2022-05-15 20:02:23 +00:00
louishorlaville
4310b55ab1
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis
2022-05-15 16:01:00 -04:00
misabiko
9149172db4
Much better color format for render textures
2022-05-15 16:00:28 -04:00
Soulaha
1a24f44c77
Pull request #34 : remove colision between dimensions
...
Merge in CEGJ/creative-jam-20 from Soulaha to main
* commit '21e510045f52c899762235324a7b7a64861ec55a':
remove colision between dimensions
2022-05-15 19:59:58 +00:00
louishorlaville
ad36b3bce7
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis
2022-05-15 15:59:21 -04:00
louishorlaville
a3a3292f76
changed starting spawns to dimension 2
2022-05-15 15:59:15 -04:00
Soulaha Balde
21e510045f
Merge remote-tracking branch 'origin/main' into Soulaha
2022-05-15 15:55:58 -04:00
Louis Horlaville
b1678dd839
Pull request #33 : Louis
...
Merge in CEGJ/creative-jam-20 from Louis to main
* commit '93b0d889e4541263b6e761c640f0d2bf4d3d2fc4':
integrated alerts
enemies balanced
2022-05-15 19:52:23 +00:00
louishorlaville
93b0d889e4
integrated alerts
2022-05-15 15:51:16 -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
DaringDan
d91e5a1a29
Pull request #30 : Music integrated
...
Merge in CEGJ/creative-jam-20 from music to main
* commit 'cd95e1ffa18311cd341612b48817ec8afbf810b2':
Merge conflict fix on Main Menu
Music integrated
2022-05-15 19:25:51 +00:00
TheDaringDan
cd95e1ffa1
Merge remote-tracking branch 'origin/main' into music
2022-05-15 15:24:35 -04:00
TheDaringDan
7999ab0324
Merge conflict fix on Main Menu
...
Return to menu behavior added
2022-05-15 15:23:42 -04:00
Jason Durand 01
10056276fc
Pull request #32 : Jason
...
Merge in CEGJ/creative-jam-20 from jason to main
* commit '25cfbf616af734d714d1353a1eab8ccfb03b33e1':
Nudged upgrades next to tabs
Added alert to dimension tab
Moving healthbars and buttons with tabs
2022-05-15 19:14:08 +00: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
a2f21477f5
Push problematic .meta
2022-05-15 15:03:33 -04:00
William Gingras 01
f4d7ae18a5
Pull request #31 : Added gain currency animation; Added EventManager; Fixes to Dimensions prefabs
...
Merge in CEGJ/creative-jam-20 from integration2 to main
* commit '860ed467b082a174310ef720e6f3124f4848da22':
Added gain currency animation; Added EventManager; Fixes to Dimensions prefabs
2022-05-15 19:01:45 +00: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
Soulaha Balde
1d3e778495
remove colision between dimensions
2022-05-15 14:47:53 -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
