Commit Graph

538 Commits

Author SHA1 Message Date
b4a23f0dce Merge pull request 'Remove double-fade transitions in 13C&D, restructure Nio's second photoshoot scene slightly' (#96) from Bowie/SnootGame:remove-double-fade into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/96
2021-10-12 20:08:54 +00:00
090b433ac5 remove double-fade transitions, restructure Nio's second photoshoot slightly 2021-10-12 20:51:42 +01:00
84e7e0da3f Merge pull request 'NioFT2' (#94) from Nio/SnootGame_w_ExtrasMenu:NioFT2 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/94
2021-10-12 19:21:21 +00:00
4bf86ea11b Merge pull request 'Fixes fast credits left over from debugging' (#95) from Bowie/SnootGame:credits-fix into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/95
2021-10-12 19:20:12 +00:00
16320f921a slow down credits to sub-lightspeed 2021-10-12 20:04:30 +01:00
Nio
4ed02c917d and the one straggler 2021-10-12 22:43:50 +11:00
Nio
3906f75f5b removed weird duplication 2021-10-12 22:42:23 +11:00
Nio
6e6d8af08b fixes 2021-10-12 22:34:26 +11:00
Bowie
75bd952957 Merge pull request 'Uplift fire alarm scene' (#93) from Bowie/SnootGame:fire-alarm into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/93
2021-10-11 22:09:29 +00:00
b578c002b4 uplift fire alarm scene 2021-10-11 22:51:12 +01:00
54b48cc96b Merge pull request 'Add credits sketches, Closes #90' (#92) from Bowie/SnootGame:credits-sketches into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/92
2021-10-11 20:36:24 +00:00
c2ad3153e3 remove debug tag 2021-10-11 21:29:25 +01:00
e217a90883 Merge branch 'Monster-Update-6' into credits-sketches 2021-10-11 21:28:01 +01:00
84aa2bafb1 add ending sketches 2021-10-11 21:27:42 +01:00
e393cec738 Fix sounds & set defaults
Set persistent values to False if None
Play both On & Off Sound
onclick_audio, hardcode the audio and instead have a flag system for
just the transitions menu
2021-10-12 07:12:09 +11:00
48913f8a83 Revert mod 2021-10-12 06:32:25 +11:00
e1b0979e6c missing shottinnitus.ogg 2021-10-11 08:26:50 +11:00
d619edbd44 Merge pull request 'Deduplicate long segment at the start of prom chapters A, C and D' (#91) from Bowie/SnootGame:prom-deduplication into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/91
2021-10-10 21:15:16 +00:00
a6eeef590e add emphasis to Samantha keeping Ripley in line 2021-10-10 21:03:00 +01:00
418464e07e fix label 2021-10-10 20:50:45 +01:00
537cd23f03 actually add the deduplicated prom segment 2021-10-10 20:49:39 +01:00
a4b98ddbe3 deduplicate large segment of script at the start of prom night, tweak leadup scripts to transition smoothly, remove soulful-but-redundant error handling block in storyline 2021-10-10 20:39:24 +01:00
Bowie
3163fa0ea8 Merge pull request 'Post merge cleanup, Closes #84' (#89) from Bowie/SnootGame:post-merge-cleanup into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/89
2021-10-10 16:05:12 +00:00
6e370f984f Merge branch 'Monster-Update-6' into post-merge-cleanup 2021-10-10 14:17:25 +01:00
f4a39e2e18 removed tumor from Rosa's palm 2021-10-10 13:44:57 +01:00
2fd318528c Merge pull request 'New image' (#87) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/87
2021-10-10 12:12:42 +00:00
3da180d5ff New image 2021-10-10 23:10:22 +11:00
Bowie
d29f889752 Merge branch 'Monster-Update-6' into post-merge-cleanup 2021-10-10 11:17:48 +00:00
91a9d1e187 less crispy Naomi 2021-10-10 11:41:02 +01:00
b6da0ef2ff Merge pull request 'Fix lint errors, Closes #83' (#86) from Bowie/SnootGame:fix-lint-errors into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/86
2021-10-10 10:34:48 +00:00
18ce4b2f45 add missing character definitions, fix wrong filename for music, fix bad filepath 2021-10-10 11:26:15 +01:00
c45728180d remove duplicate cgs 2021-10-10 09:59:22 +01:00
eef352299d fix bonus chapter button text for chx1 2021-10-10 09:54:08 +01:00
871042d6fd fix layering issue on Naomi sprites 2021-10-10 09:28:13 +01:00
8a5ea8723f re-add transparency padding to Ripley's normal sprites 2021-10-10 09:18:07 +01:00
74394c4759 Merge branch 'bncf' into Monster-Update-6 2021-10-10 13:47:41 +11:00
b94837673f Remove I Character 2021-10-10 09:15:04 +11:00
dc74629aad Remove merge comment & unrelated ch7-review.txt 2021-10-10 09:03:56 +11:00
18bed394f5 Delete duplicate png files ending in .jpg 2021-10-10 09:02:03 +11:00
836cf35d4e Remove duplicate trishfam images 2021-10-10 08:27:38 +11:00
4aac1e09b5 Merge remote-tracking branch 'Nio/choreo_ch7andup_basedonBowies' into bowieniocombo 2021-10-10 06:27:41 +11:00
Nio
3b11151771 resized reed rosa rip trish prom a and b 2021-10-10 01:57:23 +11:00
Nio
d167cee8d0 13C ext r4r 2021-10-10 00:29:19 +11:00
395187aef4 Update mods folder README.md to warn users 2021-10-09 21:06:26 +11:00
ef49b6df5b label and filename change for extra chapters menu 2021-10-09 20:58:18 +11:00
d4a517f63b """ -> # & merge fix 2021-10-09 20:49:29 +11:00
bb4c08017f Merge remote-tracking branch 'Nio/choreo_ch7andup_basedonBowies' into bowieniocombo 2021-10-09 20:25:32 +11:00
a0a81241db move ending A fang stairs image to cgs from backgrounds 2021-10-09 09:30:20 +01:00
6d7bbaede0 prune pauses from ch4 2021-10-08 23:02:15 +01:00
e61f3fdf73 Merge branch 'choreo' of git.snootgame.xyz:Bowie/SnootGame into choreo 2021-10-07 20:48:49 +01:00