Commit graph

672 commits

Author SHA1 Message Date
nutbuster
843ab5a766 Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into p7_naomi_choreo 2021-11-08 10:28:44 +11:00
nutbuster
7f8adec329 x8 choreography 2021-11-08 10:05:35 +11:00
nutbuster
456cda2d2f x9 choreography 2021-11-08 09:41:11 +11:00
Nio
f7bab30f4f fang reveal at poster 2021-11-08 01:55:37 +11:00
Nio
246074bc1a nice unfurling w the help of Bowie on poster 2021-11-08 00:28:51 +11:00
Nio
a74ae5bd53 Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into pl_2 2021-11-07 13:44:08 +11:00
Nio
124ba40de9 sf fix 2021-11-07 13:42:17 +11:00
nutbuster
ba01e99572 Merge branch 'p7_naomi_choreo' into p7_raymba 2021-11-07 13:10:31 +11:00
nutbuster
f490b3782a Jin fix 2021-11-07 13:09:09 +11:00
nutbuster
365272dd89 Fix closing cps tags 2021-11-07 13:09:09 +11:00
nutbuster
f422c75446 jin flip -> jinflip 2021-11-07 13:09:09 +11:00
nutbuster
87f6c6a838 Merge remote-tracking branch 'Nio/pl_2' into p7_naomi_choreo 2021-11-07 12:51:54 +11:00
nutbuster
0bb472afe9 x8 ... 2021-11-07 12:21:11 +11:00
nutbuster
7706164dac x9 comma & ... 2021-11-07 12:20:27 +11:00
nutbuster
269561e011 x8 choreography 2021-11-07 11:39:39 +11:00
nutbuster
777c9a8f61 Unrepeat stella line and vpunch naser arm wrestle 2021-11-07 11:39:13 +11:00
nutbuster
330c012827 Remove developer 2021-11-07 11:11:29 +11:00
nutbuster
3d91828dae Merge remote-tracking branch 'Map/Patch7' into p7_naomi_choreo 2021-11-07 11:10:56 +11:00
Map
16c5a00e18 Changed, tweaked, and added window fading to several chapters. Fixed a bathroom5. 2021-11-06 18:54:43 -05:00
nutbuster
a6c5996d82 x7 choreo update 2021-11-07 09:30:22 +11:00
nutbuster
19a7e64a1b Revert "Revert "13C Another FINAL Revision""
This reverts commit e6a26869c0.
2021-11-06 11:25:55 +11:00
nutbuster
47e27a21f0 Revert "Revert "Story Revision 13C FINAL""
This reverts commit 203a58fcad.
2021-11-06 11:25:53 +11:00
nutbuster
332aaddf97 Revert "Revert "Doing typo""
This reverts commit 827d1a40a6.
2021-11-06 11:25:49 +11:00
nutbuster
d4045d4418 Fix position of 'The End' 2021-11-05 19:48:30 +11:00
Nio
5e86f88558 elliot 2021-11-05 18:47:03 +11:00
nutbuster
668f07cb6a Raymba Ending in x10 & Title Screen 2021-11-05 18:06:40 +11:00
nutbuster
81632b4406 Remove pendant 2021-11-05 14:08:57 +11:00
nutbuster
827d1a40a6 Revert "Doing typo"
This reverts commit 4a0ac7360e.
2021-11-05 14:08:57 +11:00
nutbuster
203a58fcad Revert "Story Revision 13C FINAL"
This reverts commit 65c5ad2be7.
2021-11-05 14:08:57 +11:00
nutbuster
e6a26869c0 Revert "13C Another FINAL Revision"
This reverts commit 315c5e34a2.
2021-11-05 14:08:57 +11:00
CaveManon
df5a6cc054 Merge branch 'Patch7' of git.snootgame.xyz:Cavemanon/SnootGame into pr/128 2021-11-01 18:52:50 -05:00
Bowie
c98aba5382 Fix missing Fang tags in ch6 restaurant scene 2021-10-31 15:43:44 +00:00
Bowie
8d60806386 Fix missing Fang tag in ch4 music class 2021-10-31 15:41:03 +00:00
nutbuster
7ae0707c84 Add wingStory check for ending 4 2021-10-31 13:45:26 +11:00
nutbuster
315c5e34a2 13C Another FINAL Revision 2021-10-28 07:40:58 +11:00
nutbuster
65c5ad2be7 Story Revision 13C FINAL 2021-10-27 15:53:56 +11:00
nutbuster
f9e510fd83 Redo fang button image & Add in hover 2021-10-26 10:48:03 +11:00
nutbuster
4f7b0d4934 Finish Button image & Improve transform 2021-10-26 07:34:13 +11:00
nutbuster
fec34826ba image fix 2021-10-25 05:33:21 +11:00
nutbuster
8c9e106cfa png to jpg 2021-10-24 20:48:48 +11:00
nutbuster
4a0ac7360e Doing typo 2021-10-24 20:05:36 +11:00
nutbuster
76b8fb7969 Music fix 2021-10-21 17:25:58 +11:00
nutbuster
610718cb12 Change text-align & Add text notification for bonus chapters 2021-10-21 17:15:06 +11:00
nutbuster
13ede41c41 move background to cg 2021-10-21 17:14:47 +11:00
nutbuster
bb511b6a18 Swap the tracks & remove questionable duplicate 2021-10-19 06:49:55 +11:00
nutbuster
f37c02291c button init 2021-10-18 11:49:00 +11:00
nutbuster
66f5a4714f remove duplicate ui sound 2021-10-18 11:26:26 +11:00
nutbuster
c2416bcf74 mogrify compress cgs&backgrounds png -> jpg 2021-10-18 11:06:25 +11:00
nutbuster
03d3106c87 Duplicate audio 2021-10-18 10:57:35 +11:00
nutbuster
660d27d738 Limit saves to 9 instead of inf 2021-10-17 19:33:05 +11:00
nutbuster
4a64db599a Insult to Naomi 2021-10-17 14:36:34 +11:00
nutbuster
428720edff Preferences -> Persistent 2021-10-17 14:06:57 +11:00
nutbuster
d2b7f7c732 Story revision final mix 2021-10-17 11:47:50 +11:00
nutbuster
d229795505 punc 2021-10-17 10:17:18 +11:00
nutbuster
a21851b810 Nio's Your -> You're 2021-10-17 10:08:40 +11:00
nutbuster
8638ffc01b Merge branch 'MU6_Hotfix' of https://git.snootgame.xyz/Cavemanon/SnootGame into MU6_Hotfix 2021-10-17 10:06:16 +11:00
nutbuster
19bb05aa43 Merge branch 'MU6_Hotfix' into unbroken-hymen 2021-10-16 23:04:54 +00:00
nutbuster
5bb892394b 13C revision 2021-10-17 10:03:27 +11:00
nutbuster
e479698018 Merge branch 'master' into unbroken-hymen 2021-10-16 22:38:24 +00:00
CaveManon
72d87a1189 boomer zoomer doomer redpilled tradcath hymen unbroken fang is my
tradcath waifu!
2021-10-16 17:31:42 -05:00
nutbuster
bce3e15c7f Bonus Chapters flash 2021-10-17 04:25:12 +11:00
nutbuster
5dfe9d0628 stop the right channel music -> music1 2021-10-16 17:46:42 +11:00
Bowie
43a32a3175 give Fang the pendant for later RAYmba scene and whole of Trish III 2021-10-15 19:34:17 +01:00
nutbuster
441bd44cfe revert 1of4 -> e1of4 2021-10-15 16:44:13 +11:00
nutbuster
59a765901e 12.5A 2021-10-15 16:09:14 +11:00
CaveManon
9ac4e03f08 map updates 2021-10-14 22:41:42 -05:00
nutbuster
af033ada9e Fang -> Lucy & Naomi fix, 12.5CD chapters added
Fang -> Lucy, including Fang's Mom & Fang's Dad -> Lucy's ..
Naomi in 13C "Oh, come on, you're in..."
2021-10-15 13:16:42 +11:00
Bowie
657e0c5ea1 remove 1337 hax 2021-10-14 22:39:27 +01:00
Bowie
042065be54 remove semicolons from python wtf 2021-10-14 22:36:07 +01:00
Bowie
080ca299c0 Merge branch 'Monster-Update-6' into lets-fucking-go 2021-10-14 22:25:50 +01:00
Bowie
fb3f2c5c7e remove dupe & unused sfx, work in final changes before release 2021-10-14 21:58:12 +01:00
nutbuster
671ef6486a Saves Directory change & Changed endings filename 2021-10-15 06:41:52 +11:00
nutbuster
a77f97a565 Lyrics punc 2021-10-14 16:53:58 +11:00
nutbuster
5bbf9b8020 Punctuation and smaller capitalization fixes 2021-10-14 13:12:48 +11:00
nutbuster
7b05c1a594 Attribute line to Fang 2021-10-14 12:01:28 +11:00
nutbuster
333c6ad184 Merge branch 'Monster-Update-6' into chapter-9-adjustment 2021-10-13 22:10:47 +00:00
Bowie
01f024cb14 add Good Faith cover 2021-10-13 22:58:17 +01:00
Bowie
b65f419dfd make the Fang supporting Anon sprite visible for longer as requested 2021-10-13 22:49:19 +01:00
Bowie
be808a8607 change BG for interim scenes etc., tweak raymba to show shadow for carpeted scenes 2021-10-13 22:11:59 +01:00
Nio
f1ed86514a Merge branch 'Monster-Update-6' into NioFT2 2021-10-13 13:17:00 +00:00
Nio
68953aefb2 resolve issue #100 2021-10-13 23:04:35 +11:00
Nio
9c887f6c8a added back Rip Large 2021-10-13 21:57:28 +11:00
nutbuster
e7de17809e lewd move 2021-10-13 12:27:31 +11:00
nutbuster
8b6fda5952 Merge pull request 'MAPWork' (#98) from MAPWork into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/98
2021-10-13 01:09:15 +00:00
Bowie
7f498e223c fix crash after fire alarm scene due to debug labels 2021-10-12 21:46:50 +01:00
CaveManon
4269ecff65 Manually Merged Map's Masterpiece 2021-10-12 15:06:05 -05:00
Bowie
090b433ac5 remove double-fade transitions, restructure Nio's second photoshoot slightly 2021-10-12 20:51:42 +01:00
nutbuster
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
Bowie
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
b578c002b4 uplift fire alarm scene 2021-10-11 22:51:12 +01:00
Bowie
c2ad3153e3 remove debug tag 2021-10-11 21:29:25 +01:00
Bowie
e217a90883 Merge branch 'Monster-Update-6' into credits-sketches 2021-10-11 21:28:01 +01:00
Bowie
84aa2bafb1 add ending sketches 2021-10-11 21:27:42 +01:00
nutbuster
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
nutbuster
48913f8a83 Revert mod 2021-10-12 06:32:25 +11:00
nutbuster
e1b0979e6c missing shottinnitus.ogg 2021-10-11 08:26:50 +11:00
Bowie
a6eeef590e add emphasis to Samantha keeping Ripley in line 2021-10-10 21:03:00 +01:00
Bowie
418464e07e fix label 2021-10-10 20:50:45 +01:00
Bowie
537cd23f03 actually add the deduplicated prom segment 2021-10-10 20:49:39 +01:00
Bowie
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
6e370f984f Merge branch 'Monster-Update-6' into post-merge-cleanup 2021-10-10 14:17:25 +01:00
Bowie
f4a39e2e18 removed tumor from Rosa's palm 2021-10-10 13:44:57 +01:00
nutbuster
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
Bowie
91a9d1e187 less crispy Naomi 2021-10-10 11:41:02 +01:00
Bowie
18ce4b2f45 add missing character definitions, fix wrong filename for music, fix bad filepath 2021-10-10 11:26:15 +01:00
Bowie
c45728180d remove duplicate cgs 2021-10-10 09:59:22 +01:00
Bowie
eef352299d fix bonus chapter button text for chx1 2021-10-10 09:54:08 +01:00
Bowie
871042d6fd fix layering issue on Naomi sprites 2021-10-10 09:28:13 +01:00
Bowie
8a5ea8723f re-add transparency padding to Ripley's normal sprites 2021-10-10 09:18:07 +01:00
nutbuster
74394c4759 Merge branch 'bncf' into Monster-Update-6 2021-10-10 13:47:41 +11:00
nutbuster
b94837673f Remove I Character 2021-10-10 09:15:04 +11:00
nutbuster
dc74629aad Remove merge comment & unrelated ch7-review.txt 2021-10-10 09:03:56 +11:00
nutbuster
18bed394f5 Delete duplicate png files ending in .jpg 2021-10-10 09:02:03 +11:00
nutbuster
836cf35d4e Remove duplicate trishfam images 2021-10-10 08:27:38 +11:00
nutbuster
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
nutbuster
395187aef4 Update mods folder README.md to warn users 2021-10-09 21:06:26 +11:00
nutbuster
ef49b6df5b label and filename change for extra chapters menu 2021-10-09 20:58:18 +11:00
nutbuster
d4a517f63b """ -> # & merge fix 2021-10-09 20:49:29 +11:00
nutbuster
bb4c08017f Merge remote-tracking branch 'Nio/choreo_ch7andup_basedonBowies' into bowieniocombo 2021-10-09 20:25:32 +11:00
Bowie
a0a81241db move ending A fang stairs image to cgs from backgrounds 2021-10-09 09:30:20 +01:00
Bowie
6d7bbaede0 prune pauses from ch4 2021-10-08 23:02:15 +01:00
Bowie
e61f3fdf73 Merge branch 'choreo' of git.snootgame.xyz:Bowie/SnootGame into choreo 2021-10-07 20:48:49 +01:00
Bowie
3dd8108a95 prune pauses from ch3 2021-10-07 20:48:21 +01:00
Nio
54707d7a1e resized ge to proper 2021-10-07 21:11:14 +11:00
Nio
9542821f67 fixes and ending D cg 2021-10-07 11:54:27 +11:00
nutbuster
af0eaa1948 new default audio settings 2021-10-07 11:05:03 +11:00
nutbuster
74ae62194b sfx/sound fix & reset added 2021-10-07 10:48:08 +11:00
Nio
e7d2312a0e name tweak 2021-10-07 09:58:59 +11:00
nutbuster
15e7efa0da Merge branch 'choreo' of https://git.snootgame.xyz/Bowie/SnootGame into bowie_choreo 2021-10-07 07:26:53 +11:00
Bowie
dadc8d5b4b prune pauses from ch2 2021-10-06 20:30:01 +01:00
Nio
5036fa8987 ext work 2021-10-07 02:20:35 +11:00
nutbuster
ee74a15214 Remove stubs file 2021-10-06 09:22:55 +11:00
nutbuster
fb5cea8def Merge remote-tracking branch 'origin/Monster-Update-6' into bowie_choreo 2021-10-06 09:21:06 +11:00
Bowie
598a66357f more ch1 tweaks 2021-10-05 20:09:22 +01:00
Bowie
f3231e31bd fix Trish misgendering Fang in PotT I 2021-10-05 20:02:34 +01:00
Bowie
63e6898967 switch wording in Mous Pad chapter due to Xavier 2021-10-05 20:01:22 +01:00
Bowie
7790d9c8a8 prune pauses in ch1, add consistent intro & exit to B bonus chapters 2021-10-05 19:57:20 +01:00
Nio
ab14c790d2 PTA r4r 2021-10-05 23:53:47 +11:00
nutbuster
6f43c54d30 Merge branch 'Monster-Update-6' of https://git.snootgame.xyz/Cavemanon/SnootGame into Monster-Update-6 2021-10-05 07:36:56 +11:00
Nio
62725f3749 naomi arc3 r4r 2021-10-04 23:36:30 +11:00
Bowie
eb6d309133 actually remove pauses from roof scene bits that I forgot fuck my life 2021-10-03 20:59:48 +01:00
Bowie
5e4ff6ce85 tone down pauses in ch6 2021-10-03 20:40:19 +01:00
Bowie
bc32c4a9ad add missing raymba asset, tone down pauses in ch5, add updated sfx to ch5 2021-10-03 17:04:52 +01:00
Bowie
845156b4fe add bonus RAYmba chapter 2021-10-02 22:26:29 +01:00