Commit Graph

654 Commits

Author SHA1 Message Date
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
MichaelYick 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
Nio b946289bb7 naomi arc pt 2 2021-10-01 00:53:35 +10:00
Nio 04cdc793ee touch up and freezing atmo effect w sound 2021-09-30 22:49:42 +10:00
Bowie d08acc158f remove debug labels for phone peek scene, replace placeholder pointer 2021-09-29 19:59:13 +01:00
Nio 591837f9dd pendant problem fixed, assets added 2021-09-30 00:56:54 +10:00
Nio 4738012d2e Naomi arc 1 ready for review minor tweaks left phone bg, new pendant for fang very happy and naomi hallway 2021-09-30 00:39:31 +10:00
Bowie eec4547d47 switch Fang's phone to light theme 2021-09-28 19:29:05 +01:00
Bowie 31c6a14b6e Merge branch 'phone-peek' into choreo 2021-09-28 19:10:03 +01:00
Bowie 3257c1fe8b rotate phonepeek scene back to correct angle 2021-09-28 19:09:46 +01:00
Bowie dad966cff0 uplift SFX and VFX for a bunch of shit 2021-09-26 22:24:30 +01:00
Nio 61495d08d2 corrections - all - #1 2021-09-26 23:43:01 +10:00
Bowie 9015180d38 text tag fix 2021-09-24 14:07:42 +01:00
Bowie f7306bbf04 add bonus Trish chapter part 3 2021-09-24 14:07:05 +01:00
Nutbuster ef1293e44a Use the same ending function 2021-09-23 09:06:37 +10:00
Nutbuster 77dafb05fd Change Extra Nav Menu spacing 2021-09-23 09:03:00 +10:00
Nutbuster f5ec200dc8 Add ??? buttons for endings not 0b1111 2021-09-23 08:58:02 +10:00
Nutbuster 33aa277c05 Extra Chapters Menu 2021-09-23 08:47:03 +10:00
Bowie 4b7d2239c1 add bonus Trish chapter part 2 2021-09-19 13:56:49 +01:00
Bowie 886c2909ef add bonus Trish chapter part 1 2021-09-18 12:36:50 +01:00
Bowie 3942b354ef add scrolling Trish texts proof-of-concept 2021-09-16 19:32:30 +01:00
Bowie 2bbef6aa79 add bonus chapter - the mous pad 2021-09-14 21:40:47 +01:00
Bowie 830802e29a add extra bowling chapter 2021-09-12 20:58:11 +01:00
Bowie c0f45068f0 rework ch14B 2021-09-11 19:53:12 +01:00
Bowie f0a32d2dbe rework ch13B, remove unused sound effect, update license 2021-09-11 15:48:43 +01:00
Nio 4b325e8bd9 all ch 13, 14 w C,D done - first pass 2021-09-11 17:53:11 +10:00
Nutbuster 73baa91665 Merge branch 'Monster-Update-6' of https://git.snootgame.xyz/Cavemanon/SnootGame into Monster-Update-6 2021-09-10 15:05:11 +10:00
Bowie 018f6bdff2 fix fuckup that nobody saw 2021-09-07 22:43:25 +01:00
Bowie 0fdaefa952 rework ch12B 2021-09-07 22:40:06 +01:00
Bowie da45e3f60c add alt anon room BG with roomba to non-Nio chapters 2021-09-07 18:09:14 +01:00
Bowie 64f372695d Merge branch 'Monster-Update-6' into chapter-5-choreo
# Conflicts:
#	game/script.rpy
2021-09-07 17:19:21 +01:00
Nio 13119e78d8 13d nearly done 2021-09-07 10:24:21 +10:00
Bowie 2af35077ee finish route A first pass 2021-09-06 22:52:36 +01:00
Bowie fcb3f1645a rework ch14A up to roof scene 2021-09-05 22:14:43 +01:00
Bowie 880f77bfff rework ch13A 2021-09-05 18:17:20 +01:00
MichaelYick f5a7093112 converted to ogg 2021-09-03 11:37:08 -05:00
Nio c05c4ac014 up to 13D done 2021-09-03 23:46:50 +10:00
MichaelYick 0eac5d3c36 new music for D ending 2021-09-02 19:19:14 -05:00
Bowie a706b673f7 normalise naming for fang prom sprite set A, add extra line for Moe as requested 2021-09-02 20:23:23 +01:00
Nutbuster b886497f89 Remove text0.png duplicate 2021-09-02 12:19:51 +10:00
Bowie 6cbe54f344 rework ch12A 2021-08-30 22:02:12 +01:00
Bowie 76348da08a rework ch11A 2021-08-30 11:14:24 +01:00
Bowie c62ba3eb3c rework ch11B 2021-08-29 22:17:33 +01:00
Bowie b2c09d0b7b rework ch11C 2021-08-29 20:07:09 +01:00
Bowie d3c46bd8d7 rework ch11D 2021-08-29 19:08:24 +01:00
Bowie 782af8b237 ch6 tweaks from feedback 2021-08-29 16:58:22 +01:00
Bowie a8d04bffb6 fix Naomi dialogue for the 5D chess reveal in ch6 2021-08-29 12:25:21 +01:00
Bowie b33cc22d7a add missing text size tapering 2021-08-29 10:49:29 +01:00
Bowie 4cb5259f66 revert link spoken by Reed 2021-08-29 10:43:39 +01:00
Bowie f29c23315c rework ch6 roomba merchant scene with new sprite & dialogue 2021-08-28 23:08:53 +01:00
Bowie a500ea9974 Merge branch 'chapter-11-choreo' into choreo 2021-08-28 19:45:48 +01:00
Bowie aa3b054b60 rework ch11 auditorium confrontation between Trish & Fang, add hallway chaos during fire alarm 2021-08-28 19:43:34 +01:00
Bowie 599a059457 rework ch11 Reed FUBARs shit scenes 2021-08-26 23:14:25 +01:00
Bowie b0e79cc64e rework ch11 pre-moes apartment scene, moes restaurant scene 2021-08-26 18:54:28 +01:00
Nio 8dc84b8adc 12 c d first 2021-08-25 01:11:41 +10:00
Nio 56affbca94 ch9 ready for rev 2021-08-23 20:17:59 +10:00
Bowie 5bafeda612 rework ch11 route C auditorium, anon's room and morning at school scenes 2021-08-22 20:31:29 +01:00
Bowie 70f546d32c rework ch11 April first opening 2021-08-21 22:42:35 +01:00
Bowie da7f3e1c4d fix return value check after ch 11 PromAnouncement 2021-08-21 14:12:10 +01:00
Bowie f7b81d2b72 rework ch11 'Breaking Things' route, centralize ending checks 2021-08-21 13:27:58 +01:00
Bowie d35a7f0437 rework ch11 'sorting things' route 2021-08-20 21:39:00 +01:00
Bowie 35dcbf58e4 rework ch11 Anon's house scene 2021-08-19 18:37:06 +01:00
Nio 44f86999ab fixes v1 2021-08-20 00:36:03 +10:00
Nio 93c62bdf50 chapter 8 2021-08-17 00:27:23 +10:00
Bowie 34e71ddf10 rework ch11 Naser beats the hell out of Anon scene 2021-08-15 15:33:29 +01:00
Bowie c3653142b7 Merge branch 'chapter-5-choreo' into choreo 2021-08-15 08:43:14 +01:00
Bowie a41483fc02 stop ambient channel at end of ch10 2021-08-14 22:56:53 +01:00
Bowie e9569a83c6 stash changes, add new orange attack SFX 2021-08-14 22:25:43 +01:00
Bowie b18b7269cb fix bugged cps tag 2021-08-14 19:45:39 +01:00
Bowie e55412d4ef rework ch10, add finished wounds CGs 2021-08-14 19:16:31 +01:00
Bowie 80a4c475f4 Merge branch 'chapter-5-choreo' into chapter-6-choreo 2021-08-14 13:40:16 +01:00
Bowie 3a6acbb2ff feedback changes, refactor narrator, add Fang bikini CG to ch5 2021-08-14 13:37:23 +01:00
Nio 95dec37ded door flies 2021-08-12 16:08:43 +10:00
Nio 16409899c0 ch7 ready for rev 2021-08-12 01:09:03 +10:00
Nio f217c4cc4e cleaned 2021-08-11 22:58:50 +10:00
Nio ed7f421e35 cleanup 1 2021-08-11 21:02:53 +10:00
Nutbuster 9aaf3ad287 w 2021-08-11 07:01:57 +10:00
Nio 2fcf8c70b6 snazzy wobble effect w blur 2021-08-11 01:03:19 +10:00
Nutbuster 1b8004e6a5 Mod Loader v2 2021-08-10 11:07:45 +10:00
Bowie 08e0d6c248 ch5 minor tweaks 2021-08-09 22:38:39 +01:00
Bowie 17b1d3a061 rework ch5 brotalk with Naser, add naser brooding sprite 2021-08-09 21:25:35 +01:00
Nio aeb0f2cdfb first draft 2021-08-10 01:07:55 +10:00
Bowie 28875ed769 rework ch5 return to fang's house scene, add naser surprised sprite 2021-08-08 16:19:25 +01:00
Bowie c48fead4a6 rework ch5 'excuse self' route, troodon market, moe's pizza scene. Replace ch5 sketches 2021-08-08 12:53:57 +01:00
Nutbuster c90faec1d1 Add Right Click to escape Gallery & Help messages 2021-08-08 13:04:38 +10:00
Nutbuster 798ff85ff6 Merge fix 2021-08-08 08:31:00 +10:00
Nutbuster 3b401ccf1c Merge remote-tracking branch 'origin/Monster-Update-6' into nio_mustard 2021-08-08 07:44:33 +10:00
Nutbuster 8b47b1f3f8 variant Button fix 2021-08-08 07:12:30 +10:00
Nutbuster e5c5b6fbe9 standardize and minify py-related functions
also includes transitions fix
2021-08-08 07:11:24 +10:00
Nio d82571ffe9 smaller wav files 2021-08-08 03:11:08 +10:00
Nio 46344e7f3a added uirollover to choices 2021-08-08 02:56:14 +10:00
Nio 09195d2919 autoupdate readded, sry 2021-08-08 02:32:14 +10:00
Nio 5220b7fbb6 new options audio files 2021-08-08 02:23:16 +10:00
Nio 61dc7dd796 removed dummy vars and removed custom togglers toggling, also accidentally added junk files, sry 2021-08-08 02:13:30 +10:00
Nio 16e8e5a72a sounds revamp 2021-08-08 00:42:16 +10:00
Bowie a2e733f972 rework Ask Naser segment 2021-08-07 12:04:56 +01:00
Nio d59f59ca88 update to MU6 2021-08-07 19:51:40 +10:00
Bowie 7402ea2ae1 rework ch6 'good' choices up to troodon 2021-08-06 21:55:43 +01:00
Nutbuster e7f3e70b92 Black -> White 2021-08-07 06:11:26 +10:00
Nutbuster 24ef384443 Add all of the characters 2021-08-06 09:55:14 +10:00
Nutbuster aae7c961d3 Revised color codes & Minor name fixes 2021-08-06 09:47:52 +10:00
Nutbuster b1cdf38707 Merge branch 'Monster-Update-6' of https://git.snootgame.xyz/Cavemanon/SnootGame into Monster-Update-6 2021-08-03 11:37:43 +10:00
Nutbuster 2c9bfdfb1e Merge Fix 2021-08-03 11:29:47 +10:00
Nutbuster d2d9591339 Merge remote-tracking branch 'origin/Monster-Update-6' into nio_mu6 2021-08-03 11:23:24 +10:00
Nutbuster 9bed598168 Modify thicker Outlines 2021-08-03 07:39:36 +10:00
Bowie 52ca7a0a10 add CTC icon to ch5 monolgue lines 2021-08-02 18:21:00 +01:00
Bowie e90fd9d48b fix minor lint warnings, add missing sound effect 2021-08-02 14:47:00 +01:00
Bowie 8bd3a58d18 Merge branch 'Monster-Update-6' into chapter-5-choreo
# Conflicts:
#	game/script.rpy
#	game/script/1.first-two-days-anon-meets-fang.rpy
#	game/script/2.fourth-day-of-school.rpy
#	game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
2021-08-02 14:38:11 +01:00
Bowie 8647f53355 ch3 alterations from feedback 2021-08-02 13:10:28 +01:00
Bowie 81c39c9dad rework ch5 roof scene & chapter end 2021-08-01 20:48:46 +01:00
Bowie 89249c60ed rework ch5 buildup to roof scene 2021-08-01 11:56:49 +01:00
Bowie be0a7ccf73 rework ch5 gardening conclusion 2021-07-31 19:10:38 +01:00
Bowie cecd74c366 rework ch5 carpark scene 2021-07-31 11:00:55 +01:00
Nio 8f6393ab79 new mixer 2021-07-29 20:47:12 +10:00
Nio 665ee694ba channeld 2021-07-28 12:27:26 +10:00
Nutbuster 1efc015419 xmax ymax spacing Quick buttons 2021-07-28 09:05:31 +10:00
Nutbuster 2e32d74aec Move main menu buttons ypos 2021-07-28 08:54:22 +10:00
Nutbuster 0bdd5b3b06 Smaller mobile namebox font size 2021-07-28 08:47:13 +10:00
Bowie 682921fef5 finish ch5 gardening scene rework 2021-07-27 22:01:57 +01:00
Bowie 8c430b8d09 fix stella being absent from the ch5 gardening club lineup scene 2021-07-26 17:50:51 +01:00