Commit Graph

265 Commits

Author SHA1 Message Date
cyndrdev 930f2bacdb Merge branch 'main' into feature/player-qol 2021-05-18 19:29:36 +01:00
cyndrdev e8815b43da yeeted rocks into the sky 2021-05-18 19:05:09 +01:00
Cat Flynn 0bfa2c0ffb Merge branch 'main' into feature/player-qol 2021-05-18 18:59:31 +01:00
Cat Flynn e39736c1e3 tweak camera, shorten blink cooldown 2021-05-18 18:34:22 +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 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 d37486ef85 Merge branch 'fix/final-level-position' into 'main'
repoisition objects in final level

See merge request kernel-panic/revival!102
2021-05-18 17:13:52 +00:00
Cat Flynn b479fe66ba fix missing reference in trigger 2021-05-18 18:07:45 +01:00
Cat Flynn 7a64f890c5 add time hat 2021-05-18 17:40:00 +01:00
Cat Flynn 8cdbf48e53 reset freeze on respawn 2021-05-18 17:09:56 +01:00
Cat Flynn 361f42cf85 gauntlet graphics 2021-05-18 17:00:20 +01:00
cyndrdev b4d529767d last bits of story 2021-05-18 16:44:07 +01:00
cyndrdev 7f841d587a prefabbbssss 2021-05-18 16:40:15 +01:00
Cat Flynn 3f420ba255 Merge branch 'main' into feature/player-qol 2021-05-18 16:27:50 +01:00
cyndrdev 6b94446ffa freeze levels 2021-05-18 16:27:41 +01:00
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
cyndrdev da59eb7621 more story vo lines 2021-05-18 16:13:57 +01:00
Cat Flynn 363c74acf2 add killbox and fog to jumpy rock tunnel 2021-05-18 16:10:44 +01:00
Cat Flynn c10c5e1f4f glove wip 2021-05-18 15:28:41 +01:00
cyndrdev 77cd89732d Merge branch 'main' into feature/audio-rework 2021-05-18 15:26:30 +01:00
Cat Flynn 16e06ab7c8 fix collision in freeze levels 2021-05-18 15:00:41 +01:00
Cat Flynn a6900b38ac repoisition objects in final level 2021-05-18 14:46:35 +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 d23220fac1 fixes to forever box 2021-05-18 01:17:09 +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
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
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 d63041776a added fog to boost levels 2021-05-15 20:40:00 +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
cyndrdev 645f57d7a6 re-added baz dialogue 2021-05-15 18:00:56 +01:00