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

66 Commits

Author SHA1 Message Date
misabiko
64f7b77b35 Merge branch 'main' into jason 2022-05-15 14:53:40 -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
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
louishorlaville
6abff695cb clean up enemy 2022-05-15 13:50:27 -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
misabiko
bdc545832f Can jump through multiple dimensions 2022-05-15 13:24:19 -04:00
louishorlaville
3b5e1800ae merge conflicts resolved 2022-05-15 13:08:52 -04:00
louishorlaville
bad5bb7f04 raycast layer ignore turret 2022-05-15 13:06:15 -04:00
louishorlaville
b8171e1538 Merge branch 'main' into Louis 2022-05-15 13:04:35 -04:00
craftwill
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
craftwill
66145b2112 Merge with main 2022-05-15 12:28:07 -04:00
craftwill
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
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
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
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
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
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
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
7a572b6bfb fix unpause when going to main menu 2022-05-15 01:14:44 -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
naomi-rc
f2d23d6a40 added restart option to menu 2022-05-15 00:54:33 -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
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
Soulaha Balde
ff0d2aaf43 Merge branch 'main' into Soulaha 2022-05-14 17:38:40 -04:00
Soulaha Balde
338a670918 Added bullet amount upgrade 2022-05-14 17:37:08 -04:00
DaringDan
53d4b02ac8 Pull request #11: LossCondition 
Merge in CEGJ/creative-jam-20 from LossCondition to main

* commit '9992e0955cf30457448f94ff7de4c8e41a2572cc':
  Disabling controls works
  Game Loop V1
 2022-05-14 20:58:04 +00:00
TheDaringDan
9992e0955c Disabling controls works 2022-05-14 16:50:23 -04:00
Soulaha Balde
8594123f60 OnHover upgrades btn display "purchase" ui appears 2022-05-14 16:25:03 -04:00
misabiko
43f2114a49 Merge branch 'main' into jason 2022-05-14 16:09:22 -04:00