Commit graph

412 commits

Author SHA1 Message Date
nutbuster
a21851b810 Nio's Your -> You're 2021-10-17 10:08:40 +11:00
nutbuster
5bb892394b 13C revision 2021-10-17 10:03:27 +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
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
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
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
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
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
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
18ce4b2f45 add missing character definitions, fix wrong filename for music, fix bad filepath 2021-10-10 11:26:15 +01:00
nutbuster
b94837673f Remove I Character 2021-10-10 09:15:04 +11:00
nutbuster
4aac1e09b5 Merge remote-tracking branch 'Nio/choreo_ch7andup_basedonBowies' into bowieniocombo 2021-10-10 06:27:41 +11:00
Nio
d167cee8d0 13C ext r4r 2021-10-10 00:29:19 +11:00
nutbuster
ef49b6df5b label and filename change for extra chapters menu 2021-10-09 20:58:18 +11:00
nutbuster
bb4c08017f Merge remote-tracking branch 'Nio/choreo_ch7andup_basedonBowies' into bowieniocombo 2021-10-09 20:25:32 +11:00
Bowie
6d7bbaede0 prune pauses from ch4 2021-10-08 23:02:15 +01:00
Bowie
3dd8108a95 prune pauses from ch3 2021-10-07 20:48:21 +01:00
Nio
9542821f67 fixes and ending D cg 2021-10-07 11:54:27 +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
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
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
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
CaveManon
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
CaveManon
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
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
Nio
2fcf8c70b6 snazzy wobble effect w blur 2021-08-11 01:03:19 +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
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
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
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
Bowie
f26f3811dc rework ch5 opening and vines scene 2021-07-25 22:01:13 +01:00
Bowie
c7a2c5b692 further tidying before ch5 start 2021-07-25 13:34:52 +01:00
Bowie
143ea72ea5 fix missing text tags 2021-07-24 17:26:33 +01:00
Bowie
2dc8d59690 Map's audio updates for chapter 4 2021-07-24 17:14:06 +01:00
Bowie
d3514e53e8 Map's audio updates for chapter 3 2021-07-24 17:13:20 +01:00
Bowie
a23fe3d159 Map's audio updates for chapter 2 2021-07-24 17:08:39 +01:00
Bowie
213b215d8a Map's audio update for chapter 1 2021-07-24 17:06:17 +01:00
Bowie
1ffd4bbb0e rework ch 4 scene where Fang helps Anon, finish ch 4 first pass 2021-07-22 18:27:18 +01:00
coolestskinnieinthejungle
dfc021a662 Merge remote-tracking branch 'origin/5.1.1' into 5.1.1 2021-07-21 13:31:09 -05:00
coolestskinnieinthejungle
de994b92b9 le link change 2021-07-21 12:52:35 -05:00
nutbuster
e2173db325 Rename wounds{1..9} -> wounds0{1..9} 2021-07-19 19:27:48 +10:00
nutbuster
097befa6e7 Replay animations 2021-07-19 18:52:29 +10:00
Bowie
9cbe06a8c6 rework ch4 auditorium lunch scene, rename anon grin 2021-07-18 21:32:21 +01:00
Bowie
680221f7a8 rework ch4 opening scene, add new cafeteria ambience 2021-07-18 13:55:22 +01:00
Bowie
22d05bcbcc add ch4 todos from sound direction doc 2021-07-18 12:06:22 +01:00
Bowie
519094226f add CTC to chapter 4 monologue 2021-07-18 11:42:59 +01:00
nutbuster
be45045956 fangtail -> fang tail 2021-07-18 17:25:34 +10:00
Bowie
f59174c5d8 slightly increase speed of end fade out 2021-07-17 20:18:02 +01:00
Bowie
9f83c08ed9 add CTC to ch3 monologue 2021-07-17 20:12:23 +01:00
Bowie
a0749fc318 rework ch3 band practice scene 2021-07-17 20:10:42 +01:00
Nio
1a09e1c776 colors muted 2021-07-17 16:37:32 +10:00
coolestskinnieinthejungle
8c4177438b Merge remote-tracking branch 'nutbuster/lazysnake/feature/ISSUE-3_CG_Gallery' into 5.1.1 2021-07-16 15:08:41 -05:00
Bowie
aa3a393873 stash ch3 auditorium changes, add new trish sprite to previous scenes 2021-07-15 23:57:20 +01:00
Bowie
322beeb6dd rework ch3 band room scene 2021-07-15 19:25:28 +01:00
Nio
afe98372b5 colors modified muted ver 1 on extras 2021-07-15 18:48:31 +10:00
Bowie
d91401b6ac rework ch3 Anon runs into Stella 2021-07-14 21:40:52 +01:00
nutbuster
f5abb91f91 Fix Tarot if/else branch flow 2021-07-14 11:20:28 +10:00
Bowie
4493cd8e1b rework ch3 Naser exhaustion scene 2021-07-13 22:40:59 +01:00
Bowie
ac78a51e56 rework ch3 classroom scene 2021-07-12 22:19:31 +01:00
Bowie
104b63d1bf quality booster for chapter 1 2021-07-11 15:22:56 +01:00
Bowie
ab94de8bd8 minor tweaks 2021-07-11 12:30:19 +01:00
Bowie
d13087d86b switch RED ALERT sfx to police siren 2021-07-11 11:09:29 +01:00
Bowie
5830fdad8d fix missing spaces in a few places where 'extend' was used 2021-07-11 10:50:57 +01:00
nutbuster
5723216d95 Revert "added cg unlocks"
This reverts commit 2cba3b2be1.
2021-07-11 11:44:32 +10:00
nutbuster
fce061e138 Merge remote-tracking branch 'origin/Monster-Update-6' into lazysnake/feature/ISSUE-3_CG_Gallery 2021-07-11 10:51:29 +10:00
Bowie
d2ecb69f1c finish ch2 first pass, add SFX from gdrive 2021-07-10 19:29:47 +01:00
nutbuster
cc86a7e3f0 Fix indentation 2021-07-10 09:12:11 +10:00
Bowie
9e19298144 stash ch2 changes 2021-07-08 23:10:54 +01:00
Bowie
528be7f2c8 clean up 2021-07-04 19:06:52 +01:00
Bowie
3a41a71118 Merge branch 'Monster-Update-6' into chapter-1-choreo
# Conflicts:
#	game/script.rpy
2021-07-04 16:37:03 +01:00
Bowie
19bad8b682 mix up slapstick SFX 2021-07-04 16:18:46 +01:00
Bowie
1c49e00b94 replace classroom anxiety SFX 2021-07-04 16:00:51 +01:00
Bowie
981b7df998 crunch some sounds 2021-07-03 20:41:06 +01:00
Bowie
5335540d0b remove unused effect 2021-07-03 18:39:32 +01:00
Bowie
c3c7b3b753 add missing punch to Naser's outburst 2021-07-03 17:08:48 +01:00
Bowie
0df8dd9f94 fix line in canteen scene 2021-07-03 15:44:06 +01:00
Bowie
7832a18822 more ch1 tweaks before looking at ch2 2021-07-03 15:34:06 +01:00
Bowie
9290b34829 add missing scene after bench scene, SFX uplift 2021-07-03 14:02:55 +01:00
lazysnake
2cba3b2be1 added cg unlocks 2021-07-03 14:29:38 +02:00
Bowie
e19566dfa8 replace bell sound 2021-07-03 10:12:53 +01:00
nutbuster
b687054963 Move Namebox magic numbers and edit the script
Edited the fourth day script: "Fang Reed and Trish"
-> into an actual Character object "Fang Reed & Trish"
2021-07-03 08:59:32 +10:00
Bowie
bc4c4a2304 add ambience to reflective scene after concert 2021-07-02 22:11:04 +01:00
Bowie
56fe353dd8 SFX uplift for pizza scene 2021-07-02 22:01:58 +01:00
Bowie
cd44add13d cleanup, add more TODOs 2021-07-02 21:40:41 +01:00
Bowie
83b680efe1 SFX & music tweaks, TODOs for missing scene after Anon meets Naser & Naomi 2021-07-02 21:19:06 +01:00
Bowie
6ae319c6ce lined up end of ch1 with start of ch2 2021-07-01 21:17:38 +01:00
Bowie
075743f063 music changes to some ch1 scenes, add another music channel for crossfade effect 2021-07-01 21:09:46 +01:00
Bowie
e1eee3852d Naser gives fewer fucks when blocking Trish, volume control back up, added outdoor ambience, converted some SFX to .ogg format 2021-07-01 18:40:10 +01:00
CaveManon
e77bcbb9a3 https://git.snootgame.xyz/Cavemanon/SnootGame/issues/41#issuecomment-585 2021-06-29 01:01:03 -05:00