Commit Graph

72 Commits

Author SHA1 Message Date
Cat Flynn 4f45fa10e1 Merge branch 'main' into fix-shit-lights 2021-05-18 21:00:02 +01:00
Cat Flynn 353088b273 rotate walle 2021-05-18 19:57:06 +01:00
Cat Flynn 20f94d06bc lighting improvements and heads 2021-05-18 19:55:32 +01:00
Cat Flynn 0bfa2c0ffb Merge branch 'main' into feature/player-qol 2021-05-18 18:59:31 +01:00
Cat Flynn aede9ca14b Merge branch 'fix/rock-tunnel-kill' into 'main'
add killbox and fog to jumpy rock tunnel

See merge request kernel-panic/revival!105
2021-05-18 17:14:35 +00:00
Cat Flynn b479fe66ba fix missing reference in trigger 2021-05-18 18:07:45 +01:00
Cat Flynn 361f42cf85 gauntlet graphics 2021-05-18 17:00:20 +01:00
cyndrdev 7f841d587a prefabbbssss 2021-05-18 16:40:15 +01:00
Cat Flynn 363c74acf2 add killbox and fog to jumpy rock tunnel 2021-05-18 16:10:44 +01:00
cyndrdev 1011cd4c95 Merge branch 'main' into feature/audio-rework 2021-05-18 12:22:52 +01:00
Cat Flynn 595105467f Merge branch 'main' into feature/final-level-design 2021-05-17 23:45:39 +01:00
Cat Flynn 2e2eb5938b bunch of final level design 2021-05-17 23:37:20 +01:00
cyndrdev c56cad7a9d more sound updates wooooo 2021-05-17 17:02:55 +01:00
cyndrdev c6268add56 positional baz innit 2021-05-17 14:55:04 +01:00
Cat Flynn eda57b9234 fix myriad bugs, finish freeze env and also baz 2021-05-17 03:29:00 +01:00
Cat Flynn 4395681868 make freeze levels fully playable 2021-05-16 20:00:39 +01:00
Cat Flynn 290d6db641 Merge branch 'main' into feature/freeze-level-design 2021-05-16 01:31:19 +01:00
Cat Flynn abd72f4121 more level design 2021-05-16 01:22:50 +01:00
Cat Flynn 8757c7f371 Merge branch 'feature/level-design' into 'main'
collision cleanup, fixed softlock

See merge request kernel-panic/revival!96
2021-05-15 18:49:55 +00:00
cyndrdev 7669e7cee9 collision cleanup, fixed softlock 2021-05-15 19:29:41 +01:00
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 c45992562d retrieve freeze intro prefab 2021-05-15 15:09:57 +01:00
Cat Flynn 8a8c24ce1f Merge branch 'temp' into feature/freeze-level-design 2021-05-15 14:42:37 +01:00
cyndrdev e6cae11081 fixed oob 2021-05-15 14:40:03 +01:00
Cat Flynn d4cda1655a more freeze level env design 2021-05-15 14:39:55 +01:00
Cat Flynn 03ae8b781b mostly freeze puzzle design 2021-05-15 14:39:53 +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 a84bcd089a baz first encounter audio 2021-05-15 14:38:25 +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
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 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