Commit Graph

200 Commits

Author SHA1 Message Date
Cinder Foster-Smith ad648a9868 Merge branch 'feature/final-level-design' into 'main'
Feature/final level design

Closes #136

See merge request kernel-panic/revival!88
2021-05-15 17:37:54 +00:00
cyndrdev 645f57d7a6 re-added baz dialogue 2021-05-15 18:00:56 +01:00
Cat Flynn 4884aa4f09 Merge branch '143-platforms-float' into 'main'
made changes to the fallawayfloor prefab

Closes #143

See merge request kernel-panic/revival!93
2021-05-15 13:56:45 +00:00
Cat Flynn a84bcd089a baz first encounter audio 2021-05-15 14:38:25 +01:00
Cat Flynn e08c56adb9 Merge branch 'main' into feature/final-level-design 2021-05-15 14:19:34 +01:00
Novvator 20a7a64b1d made changes to the fallawayfloor prefab 2021-05-15 13:34:17 +01:00
Cat Flynn 51c0dc008d Merge branch 'main' into feature/final-level-design 2021-05-14 19:39:33 +01:00
cyndrdev db11e437b4 Merge branch 'main' into feature/blink-rework 2021-05-14 19:10:27 +01:00
cyndrdev 8cc9313238 reworked entrance 2021-05-13 17:18:56 +01:00
cyndrdev c281d7e371 collision fixes, lighting improvements 2021-05-13 13:35:55 +01:00
cyndrdev 220ae7b8d2 fixed all triggers 2021-05-12 20:10:58 +01:00
cyndrdev 23b7c07c03 mergey boi 2021-05-12 19:08:41 +01:00
Cat Flynn 247723cbda reposition player and add collider to entrance 2021-05-12 18:45:56 +01:00
cyndrdev 53d74ff0bc Merge branch 'main' into feature/blink-rework 2021-05-12 18:36:11 +01:00
cyndrdev 882b83cb70 main integration 2021-05-12 18:32:31 +01:00
cyndrdev 68b8f0be19 blink rework 2021-05-12 18:26:46 +01:00
cyndrdev d7f4686316 blink gauntlet design 2021-05-12 16:56:54 +01:00
Cat Flynn 88135bac17 Merge branch 'main' into fix/arrow-trap-scale 2021-05-12 13:46:27 +01:00
Cat Flynn 2d45f1fc6e link courtyard to final level with glitch tunnel teleport 2021-05-12 03:30:41 +01:00
Cat Flynn 76084c5740 Merge branch 'main' into feature/courtyard-glitch 2021-05-12 02:14:16 +01:00
Cat Flynn f93548787b Merge branch 'main' into feature/teleport 2021-05-11 18:15:31 +01:00
cyndrdev 31e96f7261 basic rework 2021-05-11 17:55:23 +01:00
Cat Flynn 3caf16655f add more sensible arrow mesh 2021-05-11 17:55:01 +01:00
Cat Flynn cbe71cdcea add jetpack 2021-05-11 01:48:24 +01:00
Cat Flynn 44ca53b755 add teleporter 2021-05-10 23:29:49 +01:00
Cat Flynn aaff82b0d1 Merge branch 'main' into feature/teleport 2021-05-10 22:50:57 +01:00
Cat Flynn 9dc3b26516 Merge branch 'main' into feature/courtyard-glitch 2021-05-10 21:28:32 +01:00
Cat Flynn 6fb2e6ae8c glitchy courtyard 2021-05-10 21:27:55 +01:00
Cat Flynn 763bd202c4 Merge branch 'feature/blink-rework' into 'main'
sorted environment node into prefabs

See merge request kernel-panic/revival!82
2021-05-10 19:25:52 +00:00
Cat Flynn 1637f9b038 Merge branch '119-final-level' into 'main'
Resolve "level design: all together now"

Closes #119

See merge request kernel-panic/revival!79
2021-05-10 16:29:03 +00:00
cyndrdev 4ac0da2c08 sorted environment node into prefabs 2021-05-10 17:16:56 +01:00
Cat Flynn c18e1937d2 adjust some prefabs 2021-05-10 12:55:00 +01:00
Cat Flynn e2c410410a test build lighting 2021-05-10 11:23:54 +01:00
Novvator 609e25b158 added prefab of the final level 2021-05-09 13:56:25 +01:00
Cat Flynn ca454bb258 complete boost level sequence 2021-05-01 02:01:57 +01:00
Cat Flynn 93861ef0a4 apply trim to boost gauntlet 2021-04-29 02:24:00 +01:00
Cat Flynn 94d6c95998 wip 2021-04-28 21:37:39 +01:00
Cat Flynn 1eab207201 wip 2021-04-28 19:26:24 +01:00
Cat Flynn 5590a93171 start work on tunnel teleport 2021-04-28 15:58:11 +01:00
Cat Flynn 780df95b8a lighting experiments 2021-04-28 00:50:24 +01:00
Cat Flynn 3cd4fdb0fe design second boost level 2021-04-28 00:27:47 +01:00
Cat Flynn a7ada25aa1 give baz a drink and improve cameras 2021-04-27 22:41:30 +01:00
Novvator 4285e6b518 wip 2021-04-27 21:31:20 +01:00
Cat Flynn 77d43c1c00 Merge branch 'main' into feature/level-design 2021-04-27 21:10:23 +01:00
Cat Flynn e6100db30f Merge branch 'main' into feature/trim2 2021-04-27 20:44:34 +01:00
Cat Flynn 0464502d56 environment prefabs in preparation for merge 2021-04-27 20:36:29 +01:00
CharlieTinley aac16946d1 Trim 2 assets, with materials and lighting changes 2021-04-27 13:02:36 +01:00
Cat Flynn 913c4d2231 import baz and disable dir lights in freeze rooms 2021-04-27 03:39:14 +01:00
Cat Flynn 4fdeabc7f0 buncha level design, prefabs and stuff 2021-04-27 00:57:07 +01:00
Cat Flynn 51437264fc wip 2021-04-26 19:12:54 +01:00