87 Commits

Author SHA1 Message Date
35fd443bd0 Merge branch 'fix/safe-zone-spawn-pos' into 'main'
respawn in middle of safe zone

Closes #117

See merge request kernel-panic/revival!58
2021-03-25 19:04:48 +00:00
7041d71c6f fix safe zone scale and appearance in builds 2021-03-25 17:24:17 +00:00
c489c8ef49 Merge branch 'feature/menus' into 'main'
ui sounds :)

See merge request kernel-panic/revival!59
2021-03-25 17:19:26 +00:00
a841238f56 added ui clicks 2021-03-25 12:19:44 +00:00
01e8c30439 Merge branch 'main' into feature/boost-puzzle-design 2021-03-25 11:24:50 +00:00
94959bcb71 Merge branch 'main' into feature/boost-puzzle-design 2021-03-25 10:43:47 +00:00
122d0e1ff3 implement falling platform chain 2021-03-24 16:54:34 +00:00
cfa6ac4027 Merge branch '14-power_freeze' into 'main'
Resolve "glove: freeze"

See merge request kernel-panic/revival!47
2021-03-24 12:54:04 +00:00
1611962ae9 messy messy merge >n< 2021-03-24 12:45:19 +00:00
317a1ea53b settings tweaked 2021-03-24 11:52:01 +00:00
9bcde1e028 added music triggers 2021-03-24 11:50:07 +00:00
a83cad4a2a create 3rd boost puzzle 2021-03-23 15:03:18 +00:00
733e3f0b59 commited player w/ cheats enabled oopsie 2021-03-23 11:52:33 +00:00
da33cc4a4a updated animation controller, got new anims in-game 2021-03-23 11:48:43 +00:00
927a1b9dd7 create killbox prefab 2021-03-22 16:45:42 +00:00
0fdc569380 Merge branch 'main' into feature/boost-puzzle-design 2021-03-22 15:59:28 +00:00
91be3b97b9 redesign arrow wall trap objects 2021-03-18 17:25:34 +00:00
9037fd264c animation and audio event on falling platforms 2021-03-17 18:31:33 +00:00
292ca65bb2 respawn fallaway floor after a few seconds in the safe zone 2021-03-17 18:04:31 +00:00
e92ae299d8 boost puzzles 1 2 complete 3 wip 2021-03-16 16:38:46 +00:00
Novvator
b94d9d7f32 changes made as per code review 2021-03-16 15:49:54 +00:00
b5a3054b5f fixed weird subtitle issues 2021-03-15 17:15:18 +00:00
ed9be08db3 Merge branch 'Camera2ndPass' into 'main'
Camera2nd pass

See merge request kernel-panic/revival!49
2021-03-15 16:51:40 +00:00
0712af572f Merge branch 'main' into Camera2ndPass 2021-03-15 16:36:48 +00:00
b57ee3dcb1 applied changes to prefabs 2021-03-15 16:35:38 +00:00
9f352f6ffe Merge branch 'main' into feature/inject-prompt-artefact-ui 2021-03-15 16:23:04 +00:00
a6a8f0ee2d fixed dialogue font 2021-03-15 16:21:40 +00:00
9cedec4d74 Merge branch 'feature/path-spline' into 'main'
Feature/path spline

Closes #44

See merge request kernel-panic/revival!45
2021-03-15 16:13:41 +00:00
Programmer-DField
b724107be4 Added the cursor script to the camera prefab. One problem is that the cursor needs to be visible and contained to the window in the artifiact screen. Will catch up with Cinder about this. 2021-03-15 12:52:43 +00:00
b8a2e67a33 platform-specific input prompt above nearby artefacts 2021-03-12 18:29:36 +00:00
a9dfbbc99d Merge branch 'main' into ArrowWall 2021-03-12 17:41:34 +00:00
3c4f28844f basic world space artefact interaction prompt 2021-03-12 17:15:27 +00:00
6baf92ea9a add spline walkway prefab 2021-03-12 15:38:23 +00:00
Programmer-DField
baad3163e6 Made changes as per code review. 2021-03-12 11:52:56 +00:00
ba3d232088 made button bois pretty 2021-03-12 00:39:08 +00:00
e1b5fc214a Merge branch 'main' into feature/dialogue-inject-prompts 2021-03-11 20:44:31 +00:00
7d5c493bcd inject input prompt sprites into dialogue 2021-03-11 20:25:16 +00:00
ecd6bab441 juiced artefact unlock screen 2021-03-11 19:34:32 +00:00
720d3cc325 artefact preview 2021-03-11 15:50:19 +00:00
4883623740 made artefact preview work 2021-03-11 13:31:35 +00:00
43f5a68d45 artefact ui overhaul 2021-03-11 13:12:19 +00:00
a76d00efa9 fixed scaling issues 2021-03-11 12:15:05 +00:00
a28207bbcd added fade boi 2021-03-11 12:02:34 +00:00
9c4a16ec55 dialogue juice 2021-03-11 11:48:17 +00:00
d5de30107f reset falling floor trap position on player respawn 2021-03-10 18:26:33 +00:00
762bbf6486 wip 2021-03-10 17:41:09 +00:00
4c689e0561 minor bugfixes 2021-03-09 14:24:31 +00:00
faa05ad1a8 final pretties 2021-03-08 17:18:43 +00:00
24be02e384 made stuff look good 2021-03-08 17:05:33 +00:00
1d06cf5fb4 backend for playerpref audio 2021-03-08 15:13:19 +00:00