Commit Graph

151 Commits

Author SHA1 Message Date
Cat Flynn a9dfbbc99d Merge branch 'main' into ArrowWall 2021-03-12 17:41:34 +00:00
Programmer-DField 7c56c0defa Changes made as suggested in code review (part2) 2021-03-12 15:58:18 +00:00
Programmer-DField baad3163e6 Made changes as per code review. 2021-03-12 11:52:56 +00:00
cyndrdev ba3d232088 made button bois pretty 2021-03-12 00:39:08 +00:00
cyndrdev 8e62127c71 added new whooshes 2021-03-12 00:18:10 +00:00
Cat Flynn e1b5fc214a Merge branch 'main' into feature/dialogue-inject-prompts 2021-03-11 20:44:31 +00:00
Cat Flynn 7d5c493bcd inject input prompt sprites into dialogue 2021-03-11 20:25:16 +00:00
cyndrdev bdd9fc2e39 buttons 2021-03-11 20:23:20 +00:00
cyndrdev ecd6bab441 juiced artefact unlock screen 2021-03-11 19:34:32 +00:00
cyndrdev 6538706e4a bad rider >:l 2021-03-11 16:01:21 +00:00
cyndrdev 599ff42a13 fixed main menu 2021-03-11 15:51:09 +00:00
cyndrdev 720d3cc325 artefact preview 2021-03-11 15:50:19 +00:00
cyndrdev 4883623740 made artefact preview work 2021-03-11 13:31:35 +00:00
cyndrdev 43f5a68d45 artefact ui overhaul 2021-03-11 13:12:19 +00:00
cyndrdev a76d00efa9 fixed scaling issues 2021-03-11 12:15:05 +00:00
cyndrdev a28207bbcd added fade boi 2021-03-11 12:02:34 +00:00
cyndrdev 9c4a16ec55 dialogue juice 2021-03-11 11:48:17 +00:00
Cat Flynn d5de30107f reset falling floor trap position on player respawn 2021-03-10 18:26:33 +00:00
Cat Flynn 762bbf6486 wip 2021-03-10 17:41:09 +00:00
cyndrdev 30df2a4b71 branding™️ 2021-03-08 17:34:51 +00:00
cyndrdev da08bdd574 oopsie 2021-03-08 17:19:14 +00:00
cyndrdev faa05ad1a8 final pretties 2021-03-08 17:18:43 +00:00
cyndrdev 24be02e384 made stuff look good 2021-03-08 17:05:33 +00:00
cyndrdev aa9526268c added graphics adjustment 2021-03-08 16:26:33 +00:00
cyndrdev 1d06cf5fb4 backend for playerpref audio 2021-03-08 15:13:19 +00:00
cyndrdev 50685f7d43 merged main properly 2021-03-05 19:33:23 +00:00
cyndrdev c86d67031d Merge branch 'main' into feature/audio-integration 2021-03-05 19:23:42 +00:00
cyndrdev 563f1f0cbf boot flow stuff 2021-03-05 18:40:20 +00:00
cyndrdev 34352d95ab added audio stuffs 2021-03-05 18:22:18 +00:00
Cat Flynn dd98fd5c40 speed up walk anim 2021-03-05 18:08:55 +00:00
Cat Flynn 6e8f8c313f update player in main scene 2021-03-05 18:06:37 +00:00
Cat Flynn 4d971c8170 Merge branch 'main' into Animation_IdletoWalkLocoMotion 2021-03-05 18:01:07 +00:00
Cat Flynn 143b3c2a7e update player prefab 2021-03-05 18:00:50 +00:00
Cat Flynn dba218cc7e delete script 2021-03-05 17:50:10 +00:00
LojZa33 e81cab42e0 no message 2021-03-05 18:44:27 +01:00
cyndrdev 4ca7a5b91b Merge branch 'main' into feature/audio-integration 2021-03-05 17:19:17 +00:00
cyndrdev de3cfe7449 tweaked VO settings 2021-03-05 17:17:58 +00:00
Cat Flynn ec8648b67c Merge branch 'main' into feature/falling-floor-trap-integration 2021-03-05 16:36:03 +00:00
Cat Flynn 43a01934bc update trap prefab 2021-03-05 16:32:21 +00:00
Cat Flynn e016e2b122 clean up trap floor prefab 2021-03-05 16:24:50 +00:00
Cinder Foster-Smith 154d809540 Merge branch 'feature/audio-integration' into 'main'
Feature/audio integration

Closes #56

See merge request kernel-panic/revival!32
2021-03-05 15:48:36 +00:00
Cat Flynn 687762b59e Merge branch 'feature/menus' into 'main'
Feature/menus

See merge request kernel-panic/revival!31
2021-03-05 15:45:02 +00:00
Cat Flynn afdf5ce87b Merge branch 'main' into feature/audio-integration 2021-03-05 15:39:03 +00:00
Cat Flynn f5262cda2c implement vo lines via programmer instrument lol 2021-03-05 15:34:52 +00:00
cyndrdev a5b2f863fe finalised main menu 2021-03-05 15:29:20 +00:00
cyndrdev 69e68e4879 Merge branch 'main' into feature/menus 2021-03-05 14:16:58 +00:00
cyndrdev 87e5249578 tried to fix FMOD dialogue issue 2021-03-05 14:11:16 +00:00
cyndrdev 6a1a99d59b Merge branch 'main' into feature/audio-integration 2021-03-05 13:42:27 +00:00
cyndrdev 377a13fb4c meta shenanigans 2021-03-05 13:42:06 +00:00
cyndrdev f20fe247a7 added VO FMOD events 2021-03-05 13:34:45 +00:00