Commit Graph

528 Commits

Author SHA1 Message Date
Cat Flynn fd9dafde2a acropolis time 2021-05-15 14:39:54 +01:00
Cat Flynn 7648f949a3 wip freeze level design 2021-05-15 14:39:53 +01:00
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 d1475cf853 import baz vo 2021-05-15 14:38:01 +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
Cat Flynn dece0b1a34 Merge branch 'feature/blink-rework' into 'main'
collision fixes & lighting improvements for blink levels

See merge request kernel-panic/revival!90
2021-05-14 20:17:03 +00: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
Cat Flynn 50cb54ff02 Merge branch 'feature/entrance-rework' into 'main'
Reworked entrance

See merge request kernel-panic/revival!91
2021-05-14 15:50:25 +00:00
cyndrdev d26dd095a5 added main & glitch skyboxes 2021-05-13 17:55:21 +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
Cinder Foster-Smith 98b35aad34 Merge branch 'feature/blink-rework' into 'main'
Blink Rework

See merge request kernel-panic/revival!89
2021-05-12 22:22:23 +00: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 3b81ef62aa Merge branch 'fix/arrow-trap-scale' into 'main'
Fix/arrow trap scale

See merge request kernel-panic/revival!87
2021-05-12 13:49:44 +00: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 d1a78220f7 Merge branch 'feature/teleport' into 'main'
Feature/teleport

See merge request kernel-panic/revival!84
2021-05-12 00:55:04 +00:00
Cat Flynn a5941e52e0 fuck namespaces hee hoo 2021-05-11 22:38:28 +01: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
Cinder Foster-Smith 04c3d4d5d4 Merge branch 'feature/jetpack' into 'main'
add jetpack

See merge request kernel-panic/revival!85
2021-05-11 17:03:30 +00: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