Commit graph

127 commits

Author SHA1 Message Date
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
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
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