Commit Graph

236 Commits

Author SHA1 Message Date
Cat Flynn 0bfa2c0ffb Merge branch 'main' into feature/player-qol 2021-05-18 18:59:31 +01:00
Cat Flynn 3597206aee Merge branch 'fix/freeze-levels-collision' into 'main'
fix collision in freeze levels

See merge request kernel-panic/revival!103
2021-05-18 17:14:21 +00:00
Cat Flynn 23e859fdc2 add big killbox 2021-05-18 17:03:04 +01:00
cyndrdev 41e06ca608 baka cinder 2021-05-18 15:32:03 +01:00
cyndrdev 77cd89732d Merge branch 'main' into feature/audio-rework 2021-05-18 15:26:30 +01:00
cyndrdev 4517e15859 dialogue test 2021-05-18 15:06:56 +01:00
Cat Flynn 16e06ab7c8 fix collision in freeze levels 2021-05-18 15:00:41 +01:00
Cat Flynn 976a8b52df fix skybox ambient light issues 2021-05-18 14:19:23 +01:00
cyndrdev be49cc48d3 added final sequence story 2021-05-18 13:24:25 +01:00
cyndrdev 1011cd4c95 Merge branch 'main' into feature/audio-rework 2021-05-18 12:22:52 +01:00
cyndrdev 8ab5b82f0e fixed music triggers 2021-05-18 01:24:07 +01:00
cyndrdev d23220fac1 fixes to forever box 2021-05-18 01:17:09 +01:00
cyndrdev 70cafe66a7 fixed intro, introduced becky to baz 2021-05-18 01:07:50 +01:00
Cat Flynn 7c243432d3 assign player references in scene 2021-05-18 00:28:05 +01:00
cyndrdev 5e4131ea1b thank u becky, absolude ledge 2021-05-18 00:07:40 +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 caa45adb47 starting dialogue 2021-05-17 23:32:40 +01:00
Cat Flynn eda57b9234 fix myriad bugs, finish freeze env and also baz 2021-05-17 03:29:00 +01:00
Cat Flynn 67eab1c2ba fix safe zones and boulder 2021-05-16 23:18:06 +01:00
Cat Flynn 4395681868 make freeze levels fully playable 2021-05-16 20:00:39 +01:00
Cat Flynn b4a331a63b fix boulder trap 2021-05-16 17:08:35 +01:00
Cat Flynn 9db0e8eb0a add fog, wip last freeze design 2021-05-16 03:42:18 +01:00
Cat Flynn 0540e704e4 Merge branch 'main' into feature/freeze-level-design 2021-05-16 01:37:12 +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
cyndrdev 1427ad9d1f added skybox 2021-05-15 20:47:56 +01:00
cyndrdev d63041776a added fog to boost levels 2021-05-15 20:40:00 +01:00
cyndrdev 4ee38172ed fog innit 2021-05-15 20:24:17 +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 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 e589e73da3 remove duplicate freeze intro 2021-05-15 14:40:19 +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 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 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 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
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