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

194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Louis Horlaville
d2a642e3d7 Pull request #44: Louis 
Merge in CEGJ/creative-jam-20 from Louis to main

* commit '18baead8d8e794c43d9a033e988acba2041c337c':
  bigger title
  tweaks
 2022-05-15 21:38:48 +00:00
louishorlaville
18baead8d8 bigger title 2022-05-15 17:38:01 -04:00
louishorlaville
c7a203b37c Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis 2022-05-15 17:36:30 -04:00
louishorlaville
771b55a469 tweaks 2022-05-15 17:34:27 -04:00
Soulaha
0b0192b5fa Pull request #43: Fix invisble bullets 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit '648d6cd402438c7ba2f7aa4cd69eaa90af892362':
  Fix invisble bullets
 2022-05-15 21:24:03 +00:00
Soulaha Balde
648d6cd402 Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-15 17:21:04 -04:00
naomi-rc
3a570bd9bf Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 2022-05-15 17:16:06 -04:00
William Gingras 01
7d9c6ede4e Pull request #42: Fix main menu fonts and add little tooltip to use shortcuts for dimensional travel 
Merge in CEGJ/creative-jam-20 from fix/menuPrincipale to main

* commit '4328da45666f276902b590b01257cc65742dae11':
  Fix main menu fonts and add little tooltip to use shortcuts for dimensional travel
 2022-05-15 21:15:45 +00:00
craftwill
4328da4566 Merge 2022-05-15 17:15:27 -04:00
Soulaha Balde
d7c3b41189 Fix invisble bullets 2022-05-15 17:14:45 -04:00
craftwill
c1479423e1 Fix main menu fonts and add little tooltip to use shortcuts for dimensional travel 2022-05-15 17:11:22 -04:00
naomi-rc
84994370ce add prefab for scores time canvas 2022-05-15 17:09:26 -04:00
naomi-rc
f3ce0c51d0 merge uicontroller 2022-05-15 17:04:59 -04:00
naomi-rc
1cb1663c55 added high score menu 2022-05-15 17:03:16 -04:00
Soulaha
ba3658bb4b Pull request #41: Add gameover screen 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit '35cbd785686c891944c2d721ba3d35fa10e20511':
  Add gameover screen
 2022-05-15 20:59:58 +00: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
naomi-rc
0451c5c6fe Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 2022-05-15 16:01:47 -04: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
naomi-rc
ae6687c8a4 add time controller and temporary add score 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