Commit Graph

257 Commits

Author SHA1 Message Date
Cat Flynn 03ae8b781b mostly freeze puzzle design 2021-05-15 14:39:53 +01:00
Cat Flynn 0d2291ed8b a touch more env 2021-05-15 14:39:52 +01:00
Cat Flynn 0fcf9b4427 wip freeze levels environment design 2021-05-15 14:39:52 +01:00
Cat Flynn 25e5b9da27 wip 2021-05-15 14:39:49 +01:00
Cat Flynn 6fec5d1b92 build lighting and some env design 2021-05-15 14:39:23 +01:00
Cat Flynn 132103140e fix falling floor 2021-05-15 14:39:22 +01:00
Cat Flynn a84bcd089a baz first encounter audio 2021-05-15 14:38:25 +01:00
Cat Flynn 5ecd269843 move prefab 2021-05-15 14:34:15 +01:00
cyndrdev dadb817898 conflict boyes fixes 2021-05-15 14:24:32 +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
cyndrdev a5869fc16c added unseen event triggers 2021-05-14 20:38:03 +01:00
Cat Flynn 51c0dc008d Merge branch 'main' into feature/final-level-design 2021-05-14 19:39:33 +01:00
cyndrdev 25fbf3ec1a minor fixes 2021-05-14 19:22:37 +01:00
Cat Flynn 2bd79265e4 Merge branch 'main' into feature/freeze-level-design 2021-05-14 19:13:40 +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
Cat Flynn 65c74ff0b7 a touch more env 2021-05-13 13:07:54 +01:00
Cat Flynn f299abb0db Merge branch 'main' into feature/freeze-level-design 2021-05-13 12:40:04 +01:00
Cat Flynn f84863de39 wip freeze levels environment design 2021-05-13 10:43:32 +01:00
cyndrdev 7f369fcf2d removed death renderers 2021-05-12 20:56:00 +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 eaf61295c1 wip 2021-05-12 15:25:01 +01:00
Cat Flynn e05c2133be Merge branch 'main' into feature/freeze-level-design 2021-05-12 14:29:03 +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 8a04d1d3a9 Merge branch 'feature/arrow-wall-graphics' into 'main'
add arrow tips to wall

See merge request kernel-panic/revival!80
2021-05-12 00:57:50 +00:00
Cat Flynn fbcc7f6a92 Merge branch 'main' into feature/arrow-wall-graphics 2021-05-11 18:16:55 +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 e811f48d42 Merge branch 'feature/arrow-wall-graphics' into fix/arrow-trap-scale 2021-05-11 16:35:41 +01:00
Cat Flynn 957310bf0f block unused door in courtyard 2021-05-11 13:53:22 +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 41ed852d04 build lighting and some env design 2021-05-10 18:14:00 +01: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
Cat Flynn be1c8ff740 Merge branch 'main' into feature/freeze-level-design 2021-05-10 17:22:38 +01:00
cyndrdev 4ac0da2c08 sorted environment node into prefabs 2021-05-10 17:16:56 +01:00
Cat Flynn f5630b4140 fix falling floor 2021-05-10 16:58:47 +01:00
Cat Flynn 3302a9adb0 Merge branch 'main' into feature/level-design 2021-05-10 15:12:45 +01:00
Cat Flynn 5b2886db5e add arrow tips to wall 2021-05-10 15:07:54 +01:00
Cat Flynn c18e1937d2 adjust some prefabs 2021-05-10 12:55:00 +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 a46d19a620 import arrow model and fix particle emission 2021-04-28 14:45:37 +01:00
Cat Flynn ac6bf175d1 Merge branch 'main' into feature/arrow-flurry-audio 2021-04-28 14:43:47 +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
Cat Flynn ae4a3d5535 fix broken materials 2021-04-27 21:15:38 +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
Cat Flynn d9c4710984 camera improvements 2021-04-27 20:11:54 +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 3fc21c21a0 import arrow flurry 2021-04-26 20:33:57 +01:00
Cat Flynn 51437264fc wip 2021-04-26 19:12:54 +01:00
Cat Flynn 0d6854cf0c create more environment prefabs 2021-04-26 17:32:35 +01:00
Cat Flynn 9c8ff85cf1 bunch of glitchy stuff, temple prefab 2021-04-25 23:44:43 +01:00
Cat Flynn 3344196f49 camera pass and start temple prefab 2021-04-25 05:16:35 +01:00
Cat Flynn b91e97984f bunch of glitchy graphics stuff idk 2021-04-24 02:06:03 +01:00
Novvator 71a3b48a78 doors now close when the player dies, changes in main to make it work 2021-04-21 16:42:11 +01:00
Cat Flynn bff72788e6 make puzzle more forgiving 2021-04-16 20:28:21 +01:00
Cat Flynn 7c7ca3c48c artefact control prefabs 2021-04-16 19:55:34 +01:00
Cat Flynn 120e7574d0 add gloves lol 2021-04-16 19:31:49 +01:00
Cat Flynn 9912ed67db Merge branch 'feature/freeze-vfx' into 'main'
made freeze have some neat sfx & vfx

See merge request kernel-panic/revival!69
2021-04-16 16:47:57 +00:00
cyndrdev 338868d041 Merge branch 'main' into feature/menus 2021-04-16 16:39:06 +01:00
cyndrdev 9bb1b4e9df added artefact description writing 2021-04-16 16:26:42 +01:00
cyndrdev a669c02858 triggers for freeze sfx & vfx 2021-04-16 15:43:19 +01:00
cyndrdev 6ec3f5f99b added freeze postfx 2021-04-16 15:31:10 +01:00
Cat Flynn 6ef4923b3d make freeze 3 playable without boost 2021-04-16 15:00:37 +01:00
Cat Flynn 3bc0b48c74 Merge branch 'main' into 95-freeze-sequence 2021-04-16 14:23:37 +01:00
Cat Flynn e75681c0b3 Merge branch 'main' into 95-freeze-sequence 2021-04-16 14:18:35 +01:00
Cat Flynn 12fccff6cd make it possible to complete freeze level 2 without boost 2021-04-16 14:17:12 +01:00
cyndrdev 116b1140df added implementation for freeze first use dialogue 2021-04-16 14:06:52 +01:00
cyndrdev e9bcb45b41 fixed bug #127 2021-04-16 13:15:54 +01:00
cyndrdev c96036b304 Merge branch 'main' into feature/boost-level-integration 2021-04-16 12:26:47 +01:00
cyndrdev 13ca75f3d3 applied cam changes to prefab 2021-04-16 12:17:15 +01:00
Novvator 7fec70745b added freeze levels in main 2021-04-16 00:57:25 +01:00
Novvator 8af98dc169 Merge branch 'feature/boost-level-integration' of https://gitlab.badbrain.dev/kernel-panic/game into 95-freeze-sequence 2021-04-15 21:47:45 +01:00
Novvator 44935911a5 finalized the freeze levels and made a small change to the RollingBoulder 2021-04-15 20:31:09 +01:00
Cat Flynn 5cdd4e376f improve camera controls 2021-04-15 19:32:09 +01:00