naomi-rc
|
1cb1663c55
|
added high score menu
|
2022-05-15 17:03:16 -04: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 |
|
naomi-rc
|
ae6687c8a4
|
add time controller and temporary add score
|
2022-05-15 16:01:00 -04: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 |
|
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 |
|
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 |
|
|
|
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 |
|
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 |
|
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 |
|
louishorlaville
|
c69ef9734e
|
Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis
|
2022-05-15 13:50:38 -04:00 |
|
louishorlaville
|
6abff695cb
|
clean up enemy
|
2022-05-15 13:50:27 -04:00 |
|
Soulaha Balde
|
b93deec12c
|
revamp main menu
Add tmp extras
|
2022-05-15 13:46:58 -04:00 |
|
|
|
61c226581b
|
Merge branch 'main' into art/HUDFont
|
2022-05-15 13:42:28 -04:00 |
|
|
|
8f3ab61510
|
Added textmeshpro extension
|
2022-05-15 13:41:33 -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 |
|
Soulaha Balde
|
dabc50ed8d
|
Merge remote-tracking branch 'origin/main' into Soulaha
|
2022-05-15 13:12:58 -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 |
|
|
|
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 |
|
Soulaha Balde
|
0e3f108594
|
fix reticle alignement
|
2022-05-15 12:31:54 -04:00 |
|
|
|
66145b2112
|
Merge with main
|
2022-05-15 12:28:07 -04:00 |
|
|
|
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 |
|
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
|
e3e73bf64f
|
lfs pull
|
2022-05-15 11:53:53 -04:00 |
|
