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

merge Patch7 into master #192

Merged
nutbuster merged 202 commits from Patch7 into master 2022-10-29 05:53:44 +00:00
Conversation 0 Commits 202 Files Changed 281 +13204 -3972
nutbuster commented 2022-10-29 05:53:26 +00:00
Member
Copy Link
No description provided.
nutbuster added 202 commits 2022-10-29 05:53:30 +00:00
Preferences -> Persistent 428720edff
Insult to Naomi 4a64db599a
Limit saves to 9 instead of inf 660d27d738
Duplicate audio 03d3106c87
mogrify compress cgs&backgrounds png -> jpg c2416bcf74
remove duplicate ui sound 66f5a4714f
button init f37c02291c
Swap the tracks & remove questionable duplicate bb511b6a18
move background to cg 13ede41c41
Change text-align & Add text notification for bonus chapters 610718cb12
Music fix 76b8fb7969
Merge branch 'master' of https://git.snootgame.xyz/Cavemanon/SnootGame into FinalFantasy7 05b95494cd
Doing typo 4a0ac7360e
png to jpg 8c9e106cfa
image fix fec34826ba
Finish Button image & Improve transform 4f7b0d4934
re-added contributing guidelines 37ff65f838
Redo fang button image & Add in hover f9e510fd83
Story Revision 13C FINAL 65c5ad2be7
Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into FinalFantasy7 da15f5cfe4
13C Another FINAL Revision 315c5e34a2
Add wingStory check for ending 4 7ae0707c84
Fix missing Fang tag in ch4 music class 8d60806386
Fix missing Fang tags in ch6 restaurant scene c98aba5382
Merge branch 'Patch7' of git.snootgame.xyz:Cavemanon/SnootGame into pr/128 df5a6cc054
Revert "13C Another FINAL Revision" e6a26869c0 
This reverts commit 315c5e34a2.
Revert "Story Revision 13C FINAL" 203a58fcad 
This reverts commit 65c5ad2be7.
Revert "Doing typo" 827d1a40a6 
This reverts commit 4a0ac7360e.
Remove pendant 81632b4406
Merge pull request 'Pendant & Revert 13C' (#142) from nutbuster/SnootGame:p7_pendant into Patch7 d72ea745cb 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/142
Raymba Ending in x10 & Title Screen 668f07cb6a
elliot 5e86f88558
Fix position of 'The End' d4045d4418
Revert "Revert "Doing typo"" 332aaddf97 
This reverts commit 827d1a40a6.
Revert "Revert "Story Revision 13C FINAL"" 47e27a21f0 
This reverts commit 203a58fcad.
Revert "Revert "13C Another FINAL Revision"" 19a7e64a1b 
This reverts commit e6a26869c0.
x7 choreo update a6c5996d82
Changed, tweaked, and added window fading to several chapters. Fixed a bathroom5. 16c5a00e18
Merge remote-tracking branch 'Map/Patch7' into p7_naomi_choreo 3d91828dae
Remove developer 330c012827
Unrepeat stella line and vpunch naser arm wrestle 777c9a8f61
x8 choreography 269561e011
x9 comma & ... 7706164dac
x8 ... 0bb472afe9
Merge remote-tracking branch 'Nio/pl_2' into p7_naomi_choreo 87f6c6a838
Merge pull request 'Patch7: Nio's Elliot changes, etc. & Map's current x7 changes + revert revert + My x7, x8 & x9 choreography' (#145) from nutbuster/SnootGame:p7_naomi_choreo into Patch7 bc16b25a57 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/145
jin flip -> jinflip f422c75446
Fix closing cps tags 365272dd89
Jin fix f490b3782a
Merge pull request 'merge fix' (#146) from nutbuster/SnootGame:p7_naomi_choreo into Patch7 55af879845 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/146
Merge branch 'p7_naomi_choreo' into p7_raymba ba01e99572
Merge branch 'Patch7' into p7_raymba 136ad23464
sf fix 124ba40de9
Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into pl_2 a74ae5bd53
nice unfurling w the help of Bowie on poster 246074bc1a
fang reveal at poster f7bab30f4f
x9 choreography 456cda2d2f
x8 choreography 7f8adec329
Merge pull request 'Raymba Ending in x10 & Title Screen' (#143) from nutbuster/SnootGame:p7_raymba into Patch7 deb3d8eb39 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/143
Merge remote-tracking branch 'cavemanon/Patch7' into p7_naomi_choreo 2390817110
Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into p7_naomi_choreo 843ab5a766
Merge pull request 'Naomi Bonus Chapters Choreography' (#147) from nutbuster/SnootGame:p7_naomi_choreo into Patch7 77d59f77ae 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/147
Added new assets for programmer use 2df42a9b7d
Merge branch 'Patch7' of https://git.snootgame.xyz/MapAnon/SnootGame into p7_raymba_choreo 6bedf14d7b
Mega Textures rename a7ae829801
Add missing megatex fritatta 40a4f0035c
Remove car sus sounds fbd0f3ccd3
Apply Gas blur the images & Rename highres images 4e27933cfa
Megatextures Anon, Naomi, Fritatta & Fang 7d78114eea
Choreography Big Ending x10 fc0a688e74
Removed car suspension sounds, Chapter x7 2/3 done, redid Cavemanon intro 1188fb2c13
Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into p7_raymba_choreo d7b210ff0d
Merge pull request 'Assets' (#148) from nutbuster/SnootGame:p7_raymba_choreo into Patch7 af055a58b2 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/148
Merge remote-tracking branch 'Map/Patch7' into p7_raymba_choreo 1b78874578
Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into Map a4a397490e
Merge pull request 'Map's new intro & x7 change' (#149) from nutbuster/SnootGame:Map into Patch7 7db0abb21e 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/149
Add & Use Map's gas blur images 2d8b923087
Merge pull request 'Add & Use Map's gas blur images' (#150) from nutbuster/SnootGame:p7_raymba into Patch7 f4ce6e365d 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/150
Fix trailing colons 106a803570
Merge branch 'Patch7' into p7_raymba e6719d0c68
Merge pull request 'Fix trailing colons' (#151) from nutbuster/SnootGame:p7_raymba into Patch7 53df59c6d4 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/151
Re-choreoed x7 up to arm wrestle scene, new sounds. 10f4a7bfc1
de-faded, 7 r4r acb4c72233
13C Story Revision FINAL BLACK LABEL PLUS R ARRANGE EDITON 1685925797
Finished x7 a4b7432941
Remove cringe config.developer a4441b0673
Merge branch 'Patch7' into Patch7 e0d79f4b48
Merge pull request '13C Story Revision FINAL BLACK LABEL PLUS R ARRANGE EDITON' (#152) from nutbuster/SnootGame:Patch7 into Patch7 f417ab9a60 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/152
Merge branch 'Patch7' into Patch7 478b9a5ff0
a 606ebcff5d
Bonus Chapters fix b84f73b897
Merge branch 'Patch7' into Patch7 b7b9002445
Merge pull request 'Bonus Chapters fix' (#154) from nutbuster/SnootGame:Patch7 into Patch7 ca250e8b7d 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/154
Merge branch 'Patch7' into Patch7 3f34371ea2
Fix minor stella fading issue near end of x7 6648af37fc
Merge pull request 'New x7 choreo' (#153) from MapAnon/SnootGame:Patch7 into Patch7 3dade35042 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/153
Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into Patch7 5c010b0291
Revert "Remove car sus sounds" 550b0c81da 
This reverts commit fbd0f3ccd3.
Remove unused car sus sounds e7f3b73923
Merge pull request 'Remove only the unused car sus sounds' (#156) from nutbuster/SnootGame:Patch7 into Patch7 6b6c2aa21e 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/156
Fixed extra's menu being offset by 10 pixels 3f3aaf5185
Tweaked 13A with new prom sprites, 14A with timing, sound, and new cg's. x3, x7 adjusted. removed ear ringing sound. 79ab69879a
Make moe taller b961d7acd8
Pan the credits earlier f6af6a2f2f
Merge pull request 'Misc changes' (#157) from nutbuster/SnootGame:Patch7 into Patch7 6c3f269fc8 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/157
rpy 7b1bcb0952
Choreography 12D fa05b7abdf
Remove fade 6a9250793e
13C Choreo 0dee8a167b
13D Choreography Overhaul 1f7fddb479
12D Aqua touchup 0b98658b38
14D Choreography Overdo 5c5e400699
Merge pull request 'Choreography 11D 12D 13D 14D' (#155) from nutbuster/SnootGame:p7_e4_choreo into Patch7 a1f8587231 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/155
Naomi new line in 4 8ee8cfa4e7
Add Spears mention Naomi a14088e840
Merge pull request 'New lines related to Naomi' (#159) from nutbuster/SnootGame:Patch7 into Patch7 a25d2e7146 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/159
Add in Fixed bloodywing.jpg fang's chin 82386b36f1
Merge pull request 'Add in Fixed bloodywing.jpg fang's chin' (#160) from nutbuster/SnootGame:Patch7 into Patch7 a8ee80730d 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/160
Fix minor stella fading issue near end of x7 39c038ac94
Fixed extra's menu being offset by 10 pixels 2f774c9d90
Tweaked 13A with new prom sprites, 14A with timing, sound, and new cg's. x3, x7 adjusted. removed ear ringing sound. 08cf842bb6
Merge pull request 'x3, x7, 14A, 13A adjustments, fix extra's menu offset.' (#158) from MapAnon/SnootGame:Patch7 into Patch7 af76ff5914 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/158
Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into Patch7 479022ed09
ch 7 r4r, ch 8 2of3 done, minor tweaks to 9 9e145a47bd
Remove unused high res images fdcdd54d41
Merge pull request 'Remove unused high res images' (#161) from nutbuster/SnootGame:Patch7 into Patch7 5e5a0728d8 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/161
Revert "Add Spears mention Naomi" dacdb49c70 
This reverts commit a14088e840.
Spears mentioning Naomi revised ebdfa2f67d
Merge pull request 'Spears mentioning Naomi Revision' (#162) from nutbuster/SnootGame:Patch7 into Patch7 b8dbf8228d 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/162
14C Choreography Redux f641808f5c
ch8 r4r 5d9c062a31
Merge pull request '14C Choreography Redux' (#163) from nutbuster/SnootGame:p7_14C_choreo into Patch7 b1950ff88d 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/163
rework ch9 anon doxxing 6e026b71f6
Ending 3 re-choreoed, save for 14C. New expressions for multiple characters, isolated prom music 9184248f7c
Fucking config.developer cb1497c07b
Merge pull request 'Rework ch9 anon doxxing' (#164) from dox-remaster into Patch7 2c2c883e4d 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/164
Merge branch 'Patch7' of https://git.snootgame.xyz/MapAnon/SnootGame into MapP7 2711f18521
Merge pull request 'Ending 3 stuff' (#165) from MapAnon/SnootGame:Patch7 into Patch7 a47a2c151c 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/165
Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into NioP7 b8499eed40
missed 47ed3ffdd7
Merge branch 'pl_2' of https://git.snootgame.xyz/Nio/SnootGame_w_ExtrasMenu into NioP7 17462506e6
Merge pull request 'Nio's changes' (#166) from nutbuster/SnootGame:NioP7 into Patch7 80bfa55b51 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/166
Uncomment the barelyblurred image 9b4ee5dff4
Merge pull request 'Uncomment the barelyblurred image' (#167) from nutbuster/SnootGame:Patch7 into Patch7 f8ff1feb0f 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/167
add throwback to Naomi lines in park reveal 6f43de90f7
Merge pull request 'Naomi scheming augmentation' (#168) from naomi-scheming-minor-tweaks into Patch7 3b90913203 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/168
Ending 4 Busted Nut style 81186f3519
re-added colored lighting 2b80c6c629
14C revised 445f800e86
x8 and x9 revamped a6fd207c3b
Fixed up x10 with fang yourself fix as well as using the correct blur, window fading added 4bdcaa2c57
Misc. Removed references to promChatterLoop1+2 and BeachLoop1+2 for new sounds, QoL Trish's Poster, New tail vid sound, partial update to Ch.1 with better choreo 20727cba44
Added shower door sound to 13A and fixed shower sounds eb315f9bf2
Ch 7 redone be0a3c6d59
Fix window fading at end of chapter 50de83d713
adjust the size - remove raymba blur p fang hover ca87b60c93
Revamp ch. 8, correct instances of tableslam 52572ef753
Merge pull request 'raymba fix' (#170) from nutbuster/SnootGame:Patch7 into Patch7 eaffa47285 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/170
Ending 4 Busted Nut style 33458bba35
re-added colored lighting 858a348a0c
14C revised 3e617a6017
x8 and x9 revamped a3ff55d2aa
Fixed up x10 with fang yourself fix as well as using the correct blur, window fading added 49e32036e0
Misc. Removed references to promChatterLoop1+2 and BeachLoop1+2 for new sounds, QoL Trish's Poster, New tail vid sound, partial update to Ch.1 with better choreo 9ad1603e38
Added shower door sound to 13A and fixed shower sounds ab1baa9c8b
Ch 7 redone df802e8cc4
Fix window fading at end of chapter 39922660f8
Revamp ch. 8, correct instances of tableslam c1bc1de3a3
ch9, anon kinda moonwalk, reed moonrun fixed d395727d59
You all should be fired for putting music in a serious scene fb6312280e
Merge pull request 'Cultivation of all changes after review rotation' (#171) from nutbuster/SnootGame:Patch7 into Patch7 5253984029 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/171
Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into Patch7 f9fe48bcd3
Put in project fall sound a76494cc3d
Merge pull request 'Patch7' (#172) from MapAnon/SnootGame:Patch7 into Patch7 5fed87c0cc 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/172
Fangsgiving version change 674dd9dfb6
Button Size fix 26feda2e79
fang d surprised -> shocked 6f557930d2
Merge pull request 'button size & version update' (#173) from nutbuster/SnootGame:Patch7 into Patch7 db0f531935 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/173
Remove unused/old megatex 6e3179d445
Remove unused composite images 8ff3d0284a
Remove unused/old megatex 15a5b8acc8
Remove unused composite images 70c2ea9594
Merge branch 'Patch7' of https://git.snootgame.xyz/nutbuster/SnootGame into Patch7 ddafeb37cf
Remove duplicate sprites d6bfe0d78d
variant force ef69b3834a
Final tweaks 23d6ee15cf
config dvel 9292bb327a
missing anonchristmas cg 6d9c26fdcf
Merge pull request 'Final tweaks' (#177) from MapAnon/SnootGame:Patch7 into Patch7 7bccde156b 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/177
Remove unused/old megatex 30a1f5c06f
Remove unused composite images d8fcbd746e
Remove duplicate sprites d01c6679d8
variant force f8e4841815
Merge branch 'Patch7' of https://git.snootgame.xyz/nutbuster/SnootGame into Patch7 c2835f43c8
Merge pull request 'Prune assets & Variant force' (#174) from nutbuster/SnootGame:Patch7 into Patch7 52f497efc1 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/174
More pruning befb728657
fixed pruning mistakes f3016f8098
Merge pull request 'final map' (#178) from nutbuster/SnootGame:Patch7 into Patch7 28cb852ab6 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/178
Map sourcing his sound in the license 53be986bca
Map +R e735f44e3b
Merge pull request 'Map License' (#179) from nutbuster/SnootGame:Patch7 into Patch7 791f6ceb7f 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/179
Config Update 7a0462506a
nutbuster merged commit 167d64ca41 into master 2022-10-29 05:53:43 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
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
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
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Cavemanon/SnootGame#192
Delete Branch "Patch7"

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?