Commit Graph

538 Commits

Author SHA1 Message Date
Cat Flynn 177cf09af4 resize fog 2021-05-18 16:25:04 +01:00
Cat Flynn 32a994c293 Merge branch 'main' into fix/final-level-position 2021-05-18 16:16:54 +01:00
Cat Flynn 13a90cca9d Merge branch 'feature/audio-rework' into 'main'
audio rework

See merge request kernel-panic/revival!104
2021-05-18 14:57:37 +00:00
cyndrdev e0a8d93eae baz head 2021-05-18 15:54:31 +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
Cinder Foster-Smith 544e3cb9e4 Merge branch 'fix/lighting' into 'main'
Fix/lighting

See merge request kernel-panic/revival!101
2021-05-18 14:13:16 +00:00
cyndrdev 4517e15859 dialogue test 2021-05-18 15:06:56 +01:00
Cat Flynn a6900b38ac repoisition objects in final level 2021-05-18 14:46:35 +01:00
cyndrdev 765f81e7b6 banksss 2021-05-18 14:21:49 +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
Cinder Foster-Smith cf2029095e Merge branch 'feature/final-level-design' into 'main'
bunch of final level design

See merge request kernel-panic/revival!100
2021-05-18 02:40:34 +00: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 7f7386bbc7 fmod bank innit 2021-05-18 00:18:14 +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
cyndrdev 11a4bc510e added plate sounds 2021-05-17 17:29:18 +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
cyndrdev 5364f6ff8b Merge branch 'main' into feature/audio-rework 2021-05-17 14:48:46 +01:00
Cinder Foster-Smith f1903316ce Merge branch 'feature/freeze-level-design' into 'main'
Feature/freeze level design

See merge request kernel-panic/revival!98
2021-05-17 13:47:10 +00:00
cyndrdev 69c98e9a8d positional sounds pass 2021-05-17 14:31:13 +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
Cinder Foster-Smith bca9f7e7bb Merge branch 'feature/freeze-level-design' into 'main'
Feature/freeze level design

See merge request kernel-panic/revival!95
2021-05-16 21:20:00 +00:00
Cat Flynn b683d7cc1b remove editor namespace 2021-05-16 20:09:29 +01:00
cyndrdev 2e774860a3 ahhhhhhhhh 2021-05-16 20:03:32 +01:00
Cat Flynn 4395681868 make freeze levels fully playable 2021-05-16 20:00:39 +01:00
cyndrdev c0fdc68927 updated vo 2021-05-16 18:08:01 +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 10fd5626cd Merge branch 'feature/fog' into 'main'
added fog and skyboxes

See merge request kernel-panic/revival!97
2021-05-16 00:33:47 +00: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
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
Cat Flynn 759eef93bb swap temples 2021-05-15 19:49:34 +01: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
Cat Flynn 605d53918d Merge branch 'feature/baz' into 'main'
Feature/baz

See merge request kernel-panic/revival!94
2021-05-15 17:03:01 +00:00