Commit Graph

370 Commits

Author SHA1 Message Date
Cat Flynn e1b5fc214a Merge branch 'main' into feature/dialogue-inject-prompts 2021-03-11 20:44:31 +00:00
Cat Flynn e3c468a1c0 remove early timeout from build script 2021-03-11 20:35:31 +00:00
Cat Flynn aad2389939 Merge branch 'feature/menus' into 'main'
created artefact preview screen.

See merge request kernel-panic/revival!42
2021-03-11 20:33:08 +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
Cat Flynn 86458ab622 Merge branch 'feature/menus' into 'main'
fixed dialogue scale issues

See merge request kernel-panic/revival!41
2021-03-11 12:30:53 +00:00
cyndrdev a76d00efa9 fixed scaling issues 2021-03-11 12:15:05 +00:00
Cat Flynn ca03ab9150 Merge branch 'feature/menus' into 'main'
dialogue juice

See merge request kernel-panic/revival!40
2021-03-11 12:11:07 +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
Cinder Foster-Smith d5a0430252 Merge branch 'bug/unity-pid' into 'main'
detect failed unity launch and retry

Closes #60

See merge request kernel-panic/revival!38
2021-03-11 11:03:06 +00:00
Cinder Foster-Smith c04bdee120 Merge branch 'bug/trap-floor-no-resest' into 'main'
Bug/trap floor no resest

Closes #74

See merge request kernel-panic/revival!39
2021-03-10 18:51:50 +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
Cat Flynn 8a92302834 copy readme to build dir 2021-03-10 13:00:33 +00:00
Cat Flynn af9708ebe9 bump time limit, improve wait message 2021-03-09 17:37:43 +00:00
Cat Flynn d3a1905f1e fix typo 2021-03-09 17:35:28 +00:00
Cat Flynn 131e8f8792 detect failed unity launch and retry 2021-03-09 17:30:48 +00:00
cyndrdev 4c689e0561 minor bugfixes 2021-03-09 14:24:31 +00:00
Cat Flynn 091b078713 Merge branch 'feature/menus' into 'main'
Feature/menus

See merge request kernel-panic/revival!37
2021-03-09 13:51:50 +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
Novvator 660569601d first implementation of freeze 2021-03-08 14:16:20 +00:00
Cat Flynn 2b3a950208 add readme 2021-03-05 22:54:47 +00:00
Cinder Foster-Smith 08c1efb0ae Merge branch 'feature/audio-integration' into 'main'
Feature/audio integration

See merge request kernel-panic/revival!36
2021-03-05 19:47:45 +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
Cat Flynn 9cfa17fb1e Merge branch 'Animation_IdletoWalkLocoMotion' into 'main'
Animation idleto walk loco motion

See merge request kernel-panic/revival!35
2021-03-05 18:23:40 +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
Cinder Foster-Smith f628ac8aa1 Merge branch 'feature/falling-floor-trap-integration' into 'main'
falling floor traps integration

Closes #66

See merge request kernel-panic/revival!33
2021-03-05 16:59:29 +00:00
Cat Flynn ec8648b67c Merge branch 'main' into feature/falling-floor-trap-integration 2021-03-05 16:36:03 +00:00