Cavemanon/SnootGame
28
Fork 18
Code Issues 11 Pull Requests 3 Actions Projects Releases 10 Wiki Activity

Choreography update for chapters 1-5 #67

Merged
nutbuster merged 95 commits from Bowie/SnootGame:chapter-5-choreo into Monster-Update-6 2021-09-07 23:49:58 +00:00
Conversation 3 Commits 95 Files Changed 68 +9303 -3315
Bowie commented 2021-08-02 17:28:14 +00:00
Member
Copy Link
No description provided.
Bowie added 92 commits 2021-08-02 17:28:16 +00:00
add basic utility for debugging game variables b86cac340b
rework choreo up to first meeting Naomi & Naser f6b55addfa
minor tweaks b4e561e1d7
add spotlight effect during Fang introduction 60a04b8daa
rework choreo for Anon's first class 8c3bf9e54c
make Anon's first class more unpleasant, start reworking canteen scene 6c07424023
rework canteen opening f56c5dc80b
finish canteen rework 6316d33c1f
rework meeting Spear, Naser's heart-to-heart, add placeholder support for CTC, add support for ambient sound loop channel 541645f810
rework concert disaster & subsequent run in with Spears 3af087ee77
rework anon's morning routine 468f367261
change CTC icon, add ambient sound channel, rework 'nasers a bro' scenes a22aa136cb
merge both routes through Spear's office into one with the appropriate dialogue variation, rework Spear's office scene 6e7e9ac7d7
rework quick route to Spear's office 3fd3895178
minor tweaks to Spear's office scene 3aac53c8b7
finish first pass of chapter 1 6de77d3c61
timing tweaks d9e46a6135
add CTC to inner monologue 799f07d0e4
more minor timing tweaks c0b49eea9c
fix minor continuity error f687e6a032
change CTC icon to start off at min alpha instead of max alpha b03361b476
fix Naser posessing naomi for a single line of dialogue 22d44dcc74
add Spears roar to concert aftermath 6828f773d6
yet more ch1 tweaks 66e3ab693b
slight change to crowd noises at the failed concert 98275a6cfe
Merge branch 'Monster-Update-6' into chapter-1-choreo f26f6a33fd 
# Conflicts:
#	game/script.rpy
#	game/script/1.first-two-days-anon-meets-fang.rpy
made trish shorter when confronting Naser fe1391a8a0
https://git.snootgame.xyz/Cavemanon/SnootGame/issues/41#issuecomment-585 e77bcbb9a3
Merge pull request 'https://git.snootgame.xyz/Cavemanon/SnootGame/issues/41#issuecomment-585' (#2) from Cavemanon/SnootGame:pr/41 into chapter-1-choreo 095299b9ba 
Reviewed-on: https://git.snootgame.xyz/Bowie/SnootGame/pulls/2
Naser gives fewer fucks when blocking Trish, volume control back up, added outdoor ambience, converted some SFX to .ogg format e1eee3852d
music changes to some ch1 scenes, add another music channel for crossfade effect 075743f063
lined up end of ch1 with start of ch2 6ae319c6ce
SFX & music tweaks, TODOs for missing scene after Anon meets Naser & Naomi 83b680efe1
cleanup, add more TODOs cd44add13d
SFX uplift for pizza scene 56fe353dd8
add ambience to reflective scene after concert bc4c4a2304
replace bell sound e19566dfa8
add missing scene after bench scene, SFX uplift 9290b34829
more ch1 tweaks before looking at ch2 7832a18822
fix line in canteen scene 0df8dd9f94
Merge branch 'Monster-Update-6' into chapter-1-choreo f7db5fb407 
# Conflicts:
#	game/script.rpy
add missing punch to Naser's outburst c3c7b3b753
remove unused effect 5335540d0b
crunch some sounds 981b7df998
replace classroom anxiety SFX 1c49e00b94
mix up slapstick SFX 19bad8b682
make CTC indicator less intrusive 8b980c00c0
Merge branch 'Monster-Update-6' into chapter-1-choreo 3a41a71118 
# Conflicts:
#	game/script.rpy
move CTC indicator to end of text d439bfc005
clean up 528be7f2c8
stash ch2 changes 9e19298144
add missing ambient track 6f75382f66
add yet another missing sound effect fbd3eacc33
finish ch2 first pass, add SFX from gdrive d2ecb69f1c
fix missing spaces in a few places where 'extend' was used 5830fdad8d
switch RED ALERT sfx to police siren d13087d86b
minor tweaks ab94de8bd8
quality booster for chapter 1 104b63d1bf
rework ch3 classroom scene ac78a51e56
rework ch3 Naser exhaustion scene 4493cd8e1b
rework ch3 Anon runs into Stella d91401b6ac
rework ch3 band room scene 322beeb6dd
stash ch3 auditorium changes, add new trish sprite to previous scenes aa3a393873
actually add the new trish sprite fml ec222164c7
rework ch3 band practice scene a0749fc318
add CTC to ch3 monologue 9f83c08ed9
slightly increase speed of end fade out f59174c5d8
add CTC to chapter 4 monologue 519094226f
add ch4 todos from sound direction doc 22d05bcbcc
rework ch4 opening scene, add new cafeteria ambience 680221f7a8
rework ch4 auditorium lunch scene, rename anon grin 9cbe06a8c6
rework ch 4 scene where Fang helps Anon, finish ch 4 first pass 1ffd4bbb0e
Map's audio update for chapter 1 213b215d8a
Map's audio updates for chapter 2 a23fe3d159
Map's audio updates for chapter 3 d3514e53e8
Map's audio updates for chapter 4 2dc8d59690
Map's sfx updates 31e5c61be9
add extra ambient channel 792fa8a288
add missing sound effect e08c58881d
fix missing text tags 143ea72ea5
further tidying before ch5 start c7a2c5b692
rework ch5 opening and vines scene f26f3811dc
fix stella being absent from the ch5 gardening club lineup scene 8c430b8d09
finish ch5 gardening scene rework 682921fef5
rework ch5 carpark scene cecd74c366
rework ch5 gardening conclusion be0a7ccf73
rework ch5 buildup to roof scene 89249c60ed
rework ch5 roof scene & chapter end 81c39c9dad
ch3 alterations from feedback 8647f53355
Merge branch 'Monster-Update-6' into chapter-5-choreo 8bd3a58d18 
# 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
fix minor lint warnings, add missing sound effect e90fd9d48b
add CTC icon to ch5 monolgue lines 52ca7a0a10
Bowie changed title from chapter-5-choreo to Choreography update for chapters 1-5 2021-08-02 17:28:23 +00:00
Bowie commented 2021-08-02 17:28:51 +00:00
Author
Member
Copy Link

Had to remake this PR because gitea pulled some odd shit.

Had to remake this PR because gitea pulled some odd shit.
nutbuster requested review from SnootDevs 2021-08-02 19:06:29 +00:00
nutbuster requested review from Owners 2021-08-02 19:06:29 +00:00
nutbuster added this to the Monster-Update-6 milestone 2021-08-02 19:06:37 +00:00
Bowie added 1 commit 2021-08-14 12:37:29 +00:00
feedback changes, refactor narrator, add Fang bikini CG to ch5 3a6acbb2ff
Bowie added 1 commit 2021-08-14 21:25:48 +00:00
stash changes, add new orange attack SFX e9569a83c6
MichaelYick commented 2021-08-14 22:57:48 +00:00
Owner
Copy Link

(sorry for hte late review) looks fine so far. no bugs or real complaints really

(sorry for hte late review) looks fine so far. no bugs or real complaints really
MichaelYick commented 2021-08-29 20:16:54 +00:00
Owner
Copy Link

if this is done, please fix the conflict and i'll merge

if this is done, please fix the conflict and i'll merge
Bowie added 1 commit 2021-09-07 16:20:45 +00:00
Merge branch 'Monster-Update-6' into chapter-5-choreo 64f372695d 
# Conflicts:
#	game/script.rpy
nutbuster merged commit 27701654a0 into Monster-Update-6 2021-09-07 23:49:58 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Cavemanon/SnootDevs
Cavemanon/Owners
Labels
Clear labels
bug
Something is not working
 Critical Priority
Absolutely urgent issues that must be delt with before others can even be considered.
duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 High Priority
Bugs that cause crashes, major story errors, or other massively negative issues. Features that are a must-have inclusion or else the game won't be as good.
 Low Priority
Minor or easy to miss errors. Features that'd be nice, but can be done with out.
 Medium Priority
Errors that stick out, but aren't fatal to gameplay. Features that are in decent demand or would improve gameplay by a signifigant amount
 Meta
for all the other fun stuff about the project thats not code
 needs more info
Something is wrong
 question
refactor
Cleaning up the cruft
 wontfix
This won't be fixed
back-burner
"Shit Nobody Cares About" issues
 bug
Something is not working
 Critical Priority
Absolutely urgent issues that must be delt with before others can even be considered.
 enhancement
New feature
 help wanted
Need some help
 High Priority
Bugs that cause crashes, major story errors, or other massively negative issues. Features that are a must-have inclusion or else the game won't be as good.
 Low Priority
Minor or easy to miss errors. Features that'd be nice, but can be done with out.
 Medium Priority
Errors that stick out, but aren't fatal to gameplay. Features that are in decent demand or would improve gameplay by a signifigant amount
 Meta
for all the other fun stuff about the project thats not code
 question
More information is needed
 undelegated
Issues that need to be assigned by a project manager
No Label
Milestone
No items
No Milestone Monster-Update-6
Projects
Clear projects
No project
Assignees
Clear assignees
bighoss Cereal columbo Jluminate Legalo Map MichaelYick Mod Mono Nerd Nio nutbuster ReleaseSmith Sl1 TheNeonWerewolf TheNerd writerdev Zadeon
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Cavemanon/SnootGame#67
Delete Branch "Bowie/SnootGame:chapter-5-choreo"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?