Cavemanon
/
SnootGame
25
0
Fork 16
Code Issues 2 Pull Requests 3 Projects Releases 4 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

202 Commits

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