65 Commits

Author SHA1 Message Date
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
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
4d971c8170 Merge branch 'main' into Animation_IdletoWalkLocoMotion 2021-03-05 18:01:07 +00:00
143b3c2a7e update player prefab 2021-03-05 18:00:50 +00:00
ec8648b67c Merge branch 'main' into feature/falling-floor-trap-integration 2021-03-05 16:36:03 +00:00
43a01934bc update trap prefab 2021-03-05 16:32:21 +00:00
e016e2b122 clean up trap floor prefab 2021-03-05 16:24:50 +00:00
687762b59e Merge branch 'feature/menus' into 'main'
Feature/menus

See merge request kernel-panic/revival!31
2021-03-05 15:45:02 +00:00
a5b2f863fe finalised main menu 2021-03-05 15:29:20 +00:00
69e68e4879 Merge branch 'main' into feature/menus 2021-03-05 14:16:58 +00:00
98a9003556 Merge branch 'main' into Traps 2021-03-05 12:06:35 +00:00
427ca62821 place artefacts and add dialogue triggers 2021-03-04 18:53:12 +00:00
fe1e69fa94 add safe and kill planes 2021-03-04 16:55:29 +00:00
0290806bbc use SO-based references for respawn position and events 2021-03-03 12:53:52 +00:00
1e8710a926 Merge branch 'main' into CineCamera 2021-03-02 19:05:19 +00:00
7551e3434e added player glue prefab 2021-03-02 19:04:38 +00:00
f90267dedf added cameras into seperate prefab 2021-03-02 18:59:04 +00:00
ef203777ae Merge branch 'main' into CineCamera 2021-03-02 18:44:31 +00:00
83b313dc8d Merge branch 'feature/scripted-dialogue-triggers' into 'main'
add prefab for scripted dialogue trigger zone

See merge request kernel-panic/revival!20
2021-03-02 18:37:56 +00:00
1d8eff8015 fixed camera rotation issues' 2021-03-02 18:28:13 +00:00
0281749075 Merge branch 'main' into artefactUI 2021-03-02 18:20:23 +00:00
cc28ee3c2f add prefab for scripted dialogue trigger zone 2021-03-02 13:24:18 +00:00
Programmer-DField
169c2a4477 Now have a work around for the camera. 2021-03-01 18:03:30 +00:00
f2cf6256c1 menu WIP 2021-03-01 17:57:41 +00:00