Commit Graph

Select branches

Hide Pull Requests

CEGJCJ20-7-alert-for-attack-on-other-worlds

LossCondition

Louis

PauseMenu

PauseRestartMenu

Soulaha

enemyHP

jason

main

music

sfx

Mono Color

• d2a642e3d7 Pull request #44: Louis main Louis Horlaville 2022-05-15 21:38:48 +00:00
• 18baead8d8 bigger title Louis louishorlaville 2022-05-15 17:38:01 -04:00
• c7a203b37c Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-15 17:36:30 -04:00
• 771b55a469 tweaks louishorlaville 2022-05-15 17:34:27 -04:00
• 0b0192b5fa Pull request #43: Fix invisble bullets Soulaha 2022-05-15 21:24:03 +00:00
• 648d6cd402 Merge remote-tracking branch 'origin/main' into Soulaha Soulaha Soulaha Balde 2022-05-15 17:21:04 -04:00
• 3a570bd9bf Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 naomi-rc 2022-05-15 17:16:06 -04:00
• 7d9c6ede4e Pull request #42: Fix main menu fonts and add little tooltip to use shortcuts for dimensional travel William Gingras 01 2022-05-15 21:15:45 +00:00
• 4328da4566 Merge craftwill 2022-05-15 17:15:27 -04:00
• d7c3b41189 Fix invisble bullets Soulaha Balde 2022-05-15 17:14:45 -04:00
• c1479423e1 Fix main menu fonts and add little tooltip to use shortcuts for dimensional travel craftwill 2022-05-15 17:11:22 -04:00
• 84994370ce add prefab for scores time canvas naomi-rc 2022-05-15 17:09:26 -04:00
• f3ce0c51d0 merge uicontroller naomi-rc 2022-05-15 17:04:59 -04:00
• 1cb1663c55 added high score menu naomi-rc 2022-05-15 17:03:16 -04:00
• ba3658bb4b Pull request #41: Add gameover screen Soulaha 2022-05-15 20:59:58 +00:00
• 35cbd78568 Merge remote-tracking branch 'origin/main' into Soulaha Soulaha Balde 2022-05-15 16:54:39 -04:00
• 85e40c173a Pull request #40: Louis Louis Horlaville 2022-05-15 20:51:28 +00:00
• b40000c70b Add gameover screen Soulaha Balde 2022-05-15 16:50:07 -04:00
• 7e7b3a45a0 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-15 16:48:57 -04:00
• d3cc49b66e fixed post merge louishorlaville 2022-05-15 16:48:39 -04:00
• b066a1b2a2 Merge remote-tracking branch 'origin/main' into main TheDaringDan 2022-05-15 16:48:05 -04:00
• c1da237e8a Cannon Shoot SFX TheDaringDan 2022-05-15 16:48:00 -04:00
• 3d68c0159a Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-15 16:42:30 -04:00
• 094bcf9dd6 merge conflicts resolved louishorlaville 2022-05-15 16:42:09 -04:00
• 219067dbb3 Pull request #39: Disable compression and set WebGL layout to minimal Jason Durand 01 2022-05-15 20:39:41 +00:00
• 7f849d6e69 Merge branch 'main' into jason jason misabiko 2022-05-15 16:39:20 -04:00
• f61dbb9edd particles on hit planet louishorlaville 2022-05-15 16:37:14 -04:00
• f015f3f5a8 Disable compression and set WebGL layout to minimal misabiko 2022-05-15 16:36:06 -04:00
• b7197e7807 Pull request #38: Add first round of SFX DaringDan 2022-05-15 20:33:50 +00:00
• 5f0e2acdb0 Add first round of SFX sfx TheDaringDan 2022-05-15 16:32:27 -04:00
• 14f3a2dda5 hit feedback particles louishorlaville 2022-05-15 16:25:30 -04:00
• 34ab392616 Pull request #37: Adding 123 hotkeys Jason Durand 01 2022-05-15 20:17:47 +00:00
• c2145b8940 Merge branch 'main' into jason misabiko 2022-05-15 16:17:04 -04:00
• d2abe4d215 Adding 123 hotkeys misabiko 2022-05-15 16:16:11 -04:00
• 2f7c894a93 Pull request #36: Much better color format for render textures Jason Durand 01 2022-05-15 20:04:53 +00:00
• 90207c5b47 Merge branch 'main' into jason misabiko 2022-05-15 16:02:39 -04:00
• 919825e10d Pull request #35: changed starting spawns to dimension 2 Louis Horlaville 2022-05-15 20:02:23 +00:00
• 0451c5c6fe Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 naomi-rc 2022-05-15 16:01:47 -04:00
• 4310b55ab1 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-15 16:01:00 -04:00
• ae6687c8a4 add time controller and temporary add score naomi-rc 2022-05-15 16:01:00 -04:00
• 9149172db4 Much better color format for render textures misabiko 2022-05-15 16:00:28 -04:00
• 1a24f44c77 Pull request #34: remove colision between dimensions Soulaha 2022-05-15 19:59:58 +00:00
• ad36b3bce7 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-15 15:59:21 -04:00
• a3a3292f76 changed starting spawns to dimension 2 louishorlaville 2022-05-15 15:59:15 -04:00
• 21e510045f Merge remote-tracking branch 'origin/main' into Soulaha Soulaha Balde 2022-05-15 15:55:58 -04:00
• b1678dd839 Pull request #33: Louis Louis Horlaville 2022-05-15 19:52:23 +00:00
• 93b0d889e4 integrated alerts louishorlaville 2022-05-15 15:51:16 -04:00
• d4de13aa55 Merge branch 'main' into Louis louishorlaville 2022-05-15 15:32:12 -04:00
• 570de063c8 merge conflict resolved louishorlaville 2022-05-15 15:30:10 -04:00
• d91e5a1a29 Pull request #30: Music integrated DaringDan 2022-05-15 19:25:51 +00:00
• cd95e1ffa1 Merge remote-tracking branch 'origin/main' into music music TheDaringDan 2022-05-15 15:24:35 -04:00
• 7999ab0324 Merge conflict fix on Main Menu TheDaringDan 2022-05-15 15:23:42 -04:00
• 10056276fc Pull request #32: Jason Jason Durand 01 2022-05-15 19:14:08 +00:00
• 25cfbf616a Nudged upgrades next to tabs misabiko 2022-05-15 15:11:46 -04:00
• 523926b4ec Merge branch 'main' into music TheDaringDan 2022-05-15 15:10:08 -04:00
• c2e6f4b2ec Merge branch 'main' into jason misabiko 2022-05-15 15:07:05 -04:00
• edc3a8d8bf Added alert to dimension tab misabiko 2022-05-15 15:06:53 -04:00
• a2f21477f5 Push problematic .meta craftwill 2022-05-15 15:03:33 -04:00
• f4d7ae18a5 Pull request #31: Added gain currency animation; Added EventManager; Fixes to Dimensions prefabs William Gingras 01 2022-05-15 19:01:45 +00:00
• 860ed467b0 Fixed problems due to textmeshpro font craftwill 2022-05-15 15:01:17 -04:00
• 64f7b77b35 Merge branch 'main' into jason misabiko 2022-05-15 14:53:40 -04:00
• 264797d801 add prefabs for alerts naomi-rc 2022-05-15 14:52:27 -04:00
• cdacdf23a5 enemies balanced louishorlaville 2022-05-15 14:51:34 -04:00
• 1d3e778495 remove colision between dimensions Soulaha Balde 2022-05-15 14:47:53 -04:00
• 41366af70a Merge branch 'main' into jason misabiko 2022-05-15 14:47:21 -04:00
• ea264b8418 Moving healthbars and buttons with tabs misabiko 2022-05-15 14:46:30 -04:00
• 3b412d8bff Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 naomi-rc 2022-05-15 14:45:58 -04:00
• 789e474b64 start of high scores naomi-rc 2022-05-15 14:45:13 -04:00
• 58d0643ba5 Music integrated TheDaringDan 2022-05-15 14:44:17 -04:00
• 51cea5fd10 Added gain currency animation; Added EventManager; Fixes to Dimensions prefabs craftwill 2022-05-15 14:43:27 -04:00
• 5906b58a83 Pull request #29: Revamp main menu Soulaha 2022-05-15 18:01:19 +00:00
• 61cf67f7bf Merge remote-tracking branch 'origin/main' into Soulaha Soulaha Balde 2022-05-15 13:59:51 -04:00
• ee5fe3d613 Merge remote-tracking branch 'origin/main' into Soulaha Soulaha Balde 2022-05-15 13:55:59 -04:00
• abef9cb903 Pull request #28: forgor to save oops Louis Horlaville 2022-05-15 17:55:25 +00:00
• e041d2deec Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-15 13:54:27 -04:00
• 509efc9755 forgor to save oops louishorlaville 2022-05-15 13:53:42 -04:00
• 200bcdab6a Pull request #27: Louis Louis Horlaville 2022-05-15 17:52:54 +00:00
• c69ef9734e Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-15 13:50:38 -04:00
• 6abff695cb clean up enemy louishorlaville 2022-05-15 13:50:27 -04:00
• b93deec12c revamp main menu Add tmp extras Soulaha Balde 2022-05-15 13:46:58 -04:00
• bb4c35606e Pull request #26: Added textmeshpro extension William Gingras 01 2022-05-15 17:43:51 +00:00
• 61c226581b Merge branch 'main' into art/HUDFont craftwill 2022-05-15 13:42:28 -04:00
• 8f3ab61510 Added textmeshpro extension craftwill 2022-05-15 13:41:33 -04:00
• 1e575d842c dimension enemies separated louishorlaville 2022-05-15 13:40:08 -04:00
• 9bb1e6a985 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-15 13:38:30 -04:00
• 5089aa9feb Pull request #25: Jason Jason Durand 01 2022-05-15 17:37:07 +00:00
• ec52c18cef Merge branch 'main' into jason misabiko 2022-05-15 13:35:23 -04:00
• bdc545832f Can jump through multiple dimensions misabiko 2022-05-15 13:24:19 -04:00
• 8185a2da38 Pull request #24: fix reticle alignement Soulaha 2022-05-15 17:16:17 +00:00
• dabc50ed8d Merge remote-tracking branch 'origin/main' into Soulaha Soulaha Balde 2022-05-15 13:12:58 -04:00
• 3b5e1800ae merge conflicts resolved louishorlaville 2022-05-15 13:08:52 -04:00
• bad5bb7f04 raycast layer ignore turret louishorlaville 2022-05-15 13:06:15 -04:00
• b8171e1538 Merge branch 'main' into Louis louishorlaville 2022-05-15 13:04:35 -04:00
• f6c2784f09 Pull request #23: Feature/healthBars William Gingras 01 2022-05-15 17:03:29 +00:00
• 8c7ea4ff9f HealtBars and Dimension1.prefab fix craftwill 2022-05-15 13:02:35 -04:00
• 21ee9cae61 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis louishorlaville 2022-05-15 12:35:46 -04:00
• f4b87a6d6e cant see enemies in different dimensions louishorlaville 2022-05-15 12:32:59 -04:00
• 0e3f108594 fix reticle alignement Soulaha Balde 2022-05-15 12:31:54 -04:00
• 66145b2112 Merge with main craftwill 2022-05-15 12:28:07 -04:00
• d167c0e913 Health bars code craftwill 2022-05-15 12:16:03 -04:00