Commit Graph

570 Commits

Author SHA1 Message Date
Cat Flynn 4e812c229a cut written artefact 2021-05-18 21:20:06 +01:00
Cat Flynn 7561c8d71d Merge branch 'fix-shit-lights' into 'main'
Fix shit lights

See merge request kernel-panic/revival!110
2021-05-18 20:09:26 +00:00
Cat Flynn 4f45fa10e1 Merge branch 'main' into fix-shit-lights 2021-05-18 21:00:02 +01:00
Cat Flynn 83ccb63d81 fuck cursors 2021-05-18 20:40:41 +01:00
Cat Flynn 9a6be45679 Merge branch 'feature/player-qol' into 'main'
player qol

See merge request kernel-panic/revival!107
2021-05-18 19:29:09 +00:00
Cat Flynn cce374d0ec disable cheats and hide cursor 2021-05-18 20:09:14 +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
cyndrdev 930f2bacdb Merge branch 'main' into feature/player-qol 2021-05-18 19:29:36 +01:00
Cat Flynn cf2e753dc9 Merge branch 'rocks-in-the-sky' into 'main'
yeeted rocks into the sky

See merge request kernel-panic/revival!109
2021-05-18 18:17:43 +00: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 a9f552d21a Merge branch 'feature/audio-rework' into 'main'
final audio rework

See merge request kernel-panic/revival!106
2021-05-18 17:12:27 +00:00
Cat Flynn b479fe66ba fix missing reference in trigger 2021-05-18 18:07:45 +01:00
cyndrdev 6618042689 audio mixing tweaks 2021-05-18 18:05:51 +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 23e859fdc2 add big killbox 2021-05-18 17:03:04 +01:00
Cat Flynn 361f42cf85 gauntlet graphics 2021-05-18 17:00:20 +01:00
cyndrdev a590b244ff mixing edits 2021-05-18 17:00:04 +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 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
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
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 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
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