Commit Graph

75 Commits

Author SHA1 Message Date
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
cyndrdev ecd6bab441 juiced artefact unlock screen 2021-03-11 19:34:32 +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 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
Cat Flynn 1aee232cb6 artefact registration, register event listeners after awake event 2021-03-05 13:26:15 +00:00
Cat Flynn 427ca62821 place artefacts and add dialogue triggers 2021-03-04 18:53:12 +00:00
Cat Flynn fe1e69fa94 add safe and kill planes 2021-03-04 16:55:29 +00:00
CharlieTinley 45ec2145ef minor bug fixes 2021-03-03 21:36:35 +00:00
Cat Flynn e772598beb add level geometry to main scene 2021-03-03 20:29:55 +00:00
Novvator faf6c30b3e small fixes 2021-03-03 16:45:09 +00:00
Cat Flynn 0290806bbc use SO-based references for respawn position and events 2021-03-03 12:53:52 +00:00
Cat Flynn 84c67b7f11 Merge branch 'Feature/TrimSheet' into 'main'
ALPHA LEVEL

See merge request kernel-panic/revival!24
2021-03-02 21:07:43 +00:00
CharlieTinley 88fd38453b Created the ALPHA level with collisions on geometry 2021-03-02 19:33:54 +00:00
cyndrdev ad40b0195e made main use new cameras 2021-03-02 19:06:17 +00:00
Cinder Foster-Smith 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
Cat Flynn bdbbaa32a8 trigger dialogue after artefact ui is dismissed 2021-03-02 18:27:56 +00:00
Cat Flynn 0281749075 Merge branch 'main' into artefactUI 2021-03-02 18:20:23 +00:00
Novvator e79053ebb5 bug fix in InputSettings UpdateMode 2021-03-02 17:50:27 +00:00
Novvator af34631ed8 artefactUI now works 2021-03-02 16:33:31 +00:00
Cat Flynn cc28ee3c2f add prefab for scripted dialogue trigger zone 2021-03-02 13:24:18 +00:00
Novvator 81ef58415a artefactUI test 2021-03-01 18:09:21 +00:00