merge Patch7 into master #192

nutbuster · 2022-10-29T05:53:26Z

nutbuster commented

2022-10-29 05:53:26 +00:00

There is no content yet.

nutbuster added 202 commits 2022-10-29 05:53:30 +00:00

428720edff Preferences -> Persistent

4a64db599a Insult to Naomi

660d27d738 Limit saves to 9 instead of inf

03d3106c87 Duplicate audio

c2416bcf74 mogrify compress cgs&backgrounds png -> jpg

66f5a4714f remove duplicate ui sound

f37c02291c button init

bb511b6a18 Swap the tracks & remove questionable duplicate

13ede41c41 move background to cg

610718cb12 Change text-align & Add text notification for bonus chapters

76b8fb7969 Music fix

05b95494cd Merge branch 'master' of https://git.snootgame.xyz/Cavemanon/SnootGame into FinalFantasy7

4a0ac7360e Doing typo

8c9e106cfa png to jpg

fec34826ba image fix

4f7b0d4934 Finish Button image & Improve transform

37ff65f838 re-added contributing guidelines

f9e510fd83 Redo fang button image & Add in hover

65c5ad2be7 Story Revision 13C FINAL

da15f5cfe4 Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into FinalFantasy7

315c5e34a2 13C Another FINAL Revision

7ae0707c84 Add wingStory check for ending 4

8d60806386 Fix missing Fang tag in ch4 music class

c98aba5382 Fix missing Fang tags in ch6 restaurant scene

df5a6cc054 Merge branch 'Patch7' of git.snootgame.xyz:Cavemanon/SnootGame into pr/128

e6a26869c0 Revert "13C Another FINAL Revision"

This reverts commit 315c5e34a2.

203a58fcad Revert "Story Revision 13C FINAL"

This reverts commit 65c5ad2be7.

827d1a40a6 Revert "Doing typo"

This reverts commit 4a0ac7360e.

81632b4406 Remove pendant

d72ea745cb Merge pull request 'Pendant & Revert 13C' (#142 ) from nutbuster/SnootGame:p7_pendant into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/142

668f07cb6a Raymba Ending in x10 & Title Screen

5e86f88558 elliot

d4045d4418 Fix position of 'The End'

332aaddf97 Revert "Revert "Doing typo""

This reverts commit 827d1a40a6.

47e27a21f0 Revert "Revert "Story Revision 13C FINAL""

This reverts commit 203a58fcad.

19a7e64a1b Revert "Revert "13C Another FINAL Revision""

This reverts commit e6a26869c0.

a6c5996d82 x7 choreo update

16c5a00e18 Changed, tweaked, and added window fading to several chapters. Fixed a bathroom5.

3d91828dae Merge remote-tracking branch 'Map/Patch7' into p7_naomi_choreo

330c012827 Remove developer

777c9a8f61 Unrepeat stella line and vpunch naser arm wrestle

269561e011 x8 choreography

7706164dac x9 comma & ...

0bb472afe9 x8 ...

87f6c6a838 Merge remote-tracking branch 'Nio/pl_2' into p7_naomi_choreo

bc16b25a57 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

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/145

f422c75446 jin flip -> jinflip

365272dd89 Fix closing cps tags

f490b3782a Jin fix

55af879845 Merge pull request 'merge fix' (#146 ) from nutbuster/SnootGame:p7_naomi_choreo into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/146

ba01e99572 Merge branch 'p7_naomi_choreo' into p7_raymba

136ad23464 Merge branch 'Patch7' into p7_raymba

124ba40de9 sf fix

a74ae5bd53 Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into pl_2

246074bc1a nice unfurling w the help of Bowie on poster

f7bab30f4f fang reveal at poster

456cda2d2f x9 choreography

7f8adec329 x8 choreography

deb3d8eb39 Merge pull request 'Raymba Ending in x10 & Title Screen' (#143 ) from nutbuster/SnootGame:p7_raymba into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/143

2390817110 Merge remote-tracking branch 'cavemanon/Patch7' into p7_naomi_choreo

843ab5a766 Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into p7_naomi_choreo

77d59f77ae Merge pull request 'Naomi Bonus Chapters Choreography' (#147 ) from nutbuster/SnootGame:p7_naomi_choreo into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/147

2df42a9b7d Added new assets for programmer use

6bedf14d7b Merge branch 'Patch7' of https://git.snootgame.xyz/MapAnon/SnootGame into p7_raymba_choreo

a7ae829801 Mega Textures rename

40a4f0035c Add missing megatex fritatta

fbd0f3ccd3 Remove car sus sounds

4e27933cfa Apply Gas blur the images & Rename highres images

7d78114eea Megatextures Anon, Naomi, Fritatta & Fang

fc0a688e74 Choreography Big Ending x10

1188fb2c13 Removed car suspension sounds, Chapter x7 2/3 done, redid Cavemanon intro

d7b210ff0d Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into p7_raymba_choreo

af055a58b2 Merge pull request 'Assets' (#148 ) from nutbuster/SnootGame:p7_raymba_choreo into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/148

1b78874578 Merge remote-tracking branch 'Map/Patch7' into p7_raymba_choreo

a4a397490e Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into Map

7db0abb21e Merge pull request 'Map's new intro & x7 change' (#149 ) from nutbuster/SnootGame:Map into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/149

2d8b923087 Add & Use Map's gas blur images

f4ce6e365d Merge pull request 'Add & Use Map's gas blur images' (#150 ) from nutbuster/SnootGame:p7_raymba into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/150

106a803570 Fix trailing colons

e6719d0c68 Merge branch 'Patch7' into p7_raymba

53df59c6d4 Merge pull request 'Fix trailing colons' (#151 ) from nutbuster/SnootGame:p7_raymba into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/151

10f4a7bfc1 Re-choreoed x7 up to arm wrestle scene, new sounds.

acb4c72233 de-faded, 7 r4r

1685925797 13C Story Revision FINAL BLACK LABEL PLUS R ARRANGE EDITON

a4b7432941 Finished x7

a4441b0673 Remove cringe config.developer

e0d79f4b48 Merge branch 'Patch7' into Patch7

f417ab9a60 Merge pull request '13C Story Revision FINAL BLACK LABEL PLUS R ARRANGE EDITON' (#152 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/152

478b9a5ff0 Merge branch 'Patch7' into Patch7

606ebcff5d a

b84f73b897 Bonus Chapters fix

b7b9002445 Merge branch 'Patch7' into Patch7

ca250e8b7d Merge pull request 'Bonus Chapters fix' (#154 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/154

3f34371ea2 Merge branch 'Patch7' into Patch7

6648af37fc Fix minor stella fading issue near end of x7

3dade35042 Merge pull request 'New x7 choreo' (#153 ) from MapAnon/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/153

5c010b0291 Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into Patch7

550b0c81da Revert "Remove car sus sounds"

This reverts commit fbd0f3ccd3.

e7f3b73923 Remove unused car sus sounds

6b6c2aa21e Merge pull request 'Remove only the unused car sus sounds' (#156 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/156

3f3aaf5185 Fixed extra's menu being offset by 10 pixels

79ab69879a Tweaked 13A with new prom sprites, 14A with timing, sound, and new cg's. x3, x7 adjusted. removed ear ringing sound.

b961d7acd8 Make moe taller

f6af6a2f2f Pan the credits earlier

6c3f269fc8 Merge pull request 'Misc changes' (#157 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/157

7b1bcb0952 rpy

fa05b7abdf Choreography 12D

6a9250793e Remove fade

0dee8a167b 13C Choreo

1f7fddb479 13D Choreography Overhaul

0b98658b38 12D Aqua touchup

5c5e400699 14D Choreography Overdo

a1f8587231 Merge pull request 'Choreography 11D 12D 13D 14D' (#155 ) from nutbuster/SnootGame:p7_e4_choreo into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/155

8ee8cfa4e7 Naomi new line in 4

a14088e840 Add Spears mention Naomi

a25d2e7146 Merge pull request 'New lines related to Naomi' (#159 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/159

82386b36f1 Add in Fixed bloodywing.jpg fang's chin

a8ee80730d Merge pull request 'Add in Fixed bloodywing.jpg fang's chin' (#160 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/160

39c038ac94 Fix minor stella fading issue near end of x7

2f774c9d90 Fixed extra's menu being offset by 10 pixels

08cf842bb6 Tweaked 13A with new prom sprites, 14A with timing, sound, and new cg's. x3, x7 adjusted. removed ear ringing sound.

af76ff5914 Merge pull request 'x3, x7, 14A, 13A adjustments, fix extra's menu offset.' (#158 ) from MapAnon/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/158

479022ed09 Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into Patch7

9e145a47bd ch 7 r4r, ch 8 2of3 done, minor tweaks to 9

fdcdd54d41 Remove unused high res images

5e5a0728d8 Merge pull request 'Remove unused high res images' (#161 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/161

dacdb49c70 Revert "Add Spears mention Naomi"

This reverts commit a14088e840.

ebdfa2f67d Spears mentioning Naomi revised

b8dbf8228d Merge pull request 'Spears mentioning Naomi Revision' (#162 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/162

f641808f5c 14C Choreography Redux

5d9c062a31 ch8 r4r

b1950ff88d Merge pull request '14C Choreography Redux' (#163 ) from nutbuster/SnootGame:p7_14C_choreo into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/163

6e026b71f6 rework ch9 anon doxxing

9184248f7c Ending 3 re-choreoed, save for 14C. New expressions for multiple characters, isolated prom music

cb1497c07b Fucking config.developer

2c2c883e4d Merge pull request 'Rework ch9 anon doxxing' (#164 ) from dox-remaster into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/164

2711f18521 Merge branch 'Patch7' of https://git.snootgame.xyz/MapAnon/SnootGame into MapP7

a47a2c151c Merge pull request 'Ending 3 stuff' (#165 ) from MapAnon/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/165

b8499eed40 Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into NioP7

47ed3ffdd7 missed

17462506e6 Merge branch 'pl_2' of https://git.snootgame.xyz/Nio/SnootGame_w_ExtrasMenu into NioP7

80bfa55b51 Merge pull request 'Nio's changes' (#166 ) from nutbuster/SnootGame:NioP7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/166

9b4ee5dff4 Uncomment the barelyblurred image

f8ff1feb0f Merge pull request 'Uncomment the barelyblurred image' (#167 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/167

6f43de90f7 add throwback to Naomi lines in park reveal

3b90913203 Merge pull request 'Naomi scheming augmentation' (#168 ) from naomi-scheming-minor-tweaks into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/168

81186f3519 Ending 4 Busted Nut style

2b80c6c629 re-added colored lighting

445f800e86 14C revised

a6fd207c3b x8 and x9 revamped

4bdcaa2c57 Fixed up x10 with fang yourself fix as well as using the correct blur, window fading added

20727cba44 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

eb315f9bf2 Added shower door sound to 13A and fixed shower sounds

be0a3c6d59 Ch 7 redone

50de83d713 Fix window fading at end of chapter

ca87b60c93 adjust the size - remove raymba blur p fang hover

52572ef753 Revamp ch. 8, correct instances of tableslam

eaffa47285 Merge pull request 'raymba fix' (#170 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/170

33458bba35 Ending 4 Busted Nut style

858a348a0c re-added colored lighting

3e617a6017 14C revised

a3ff55d2aa x8 and x9 revamped

49e32036e0 Fixed up x10 with fang yourself fix as well as using the correct blur, window fading added

9ad1603e38 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

ab1baa9c8b Added shower door sound to 13A and fixed shower sounds

df802e8cc4 Ch 7 redone

39922660f8 Fix window fading at end of chapter

c1bc1de3a3 Revamp ch. 8, correct instances of tableslam

d395727d59 ch9, anon kinda moonwalk, reed moonrun fixed

fb6312280e You all should be fired for putting music in a serious scene

5253984029 Merge pull request 'Cultivation of all changes after review rotation' (#171 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/171

f9fe48bcd3 Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into Patch7

a76494cc3d Put in project fall sound

5fed87c0cc Merge pull request 'Patch7' (#172 ) from MapAnon/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/172

674dd9dfb6 Fangsgiving version change

26feda2e79 Button Size fix

6f557930d2 fang d surprised -> shocked

db0f531935 Merge pull request 'button size & version update' (#173 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/173

6e3179d445 Remove unused/old megatex

8ff3d0284a Remove unused composite images

15a5b8acc8 Remove unused/old megatex

70c2ea9594 Remove unused composite images

ddafeb37cf Merge branch 'Patch7' of https://git.snootgame.xyz/nutbuster/SnootGame into Patch7

d6bfe0d78d Remove duplicate sprites

ef69b3834a variant force

23d6ee15cf Final tweaks

9292bb327a config dvel

6d9c26fdcf missing anonchristmas cg

7bccde156b Merge pull request 'Final tweaks' (#177 ) from MapAnon/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/177

30a1f5c06f Remove unused/old megatex

d8fcbd746e Remove unused composite images

d01c6679d8 Remove duplicate sprites

f8e4841815 variant force

c2835f43c8 Merge branch 'Patch7' of https://git.snootgame.xyz/nutbuster/SnootGame into Patch7

52f497efc1 Merge pull request 'Prune assets & Variant force' (#174 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/174

befb728657 More pruning

f3016f8098 fixed pruning mistakes

28cb852ab6 Merge pull request 'final map' (#178 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/178

53be986bca Map sourcing his sound in the license

e735f44e3b Map +R

791f6ceb7f Merge pull request 'Map License' (#179 ) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/179

7a0462506a Config Update

nutbuster merged commit 167d64ca41 into master

2022-10-29 05:53:43 +00:00

nutbuster referenced this issue from a commit

2022-10-29 05:53:45 +00:00

Merge pull request 'merge Patch7 into master' (#192) from Patch7 into master

Sign in to join this conversation.

No reviewers

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Cavemanon/SnootGame#192