Commit Graph

592 Commits

Author SHA1 Message Date
Nutbuster 46d584986c Merge branch 'MU6_Hotfix' of https://git.snootgame.xyz/Cavemanon/SnootGame into MU6_Hotfix 2021-10-17 11:49:46 +11:00
Nutbuster d2b7f7c732 Story revision final mix 2021-10-17 11:47:50 +11:00
Nutbuster 0812952272 Merge pull request 'Story revision' (#121) from nutbuster/SnootGame:MU6_Hotfix into MU6_Hotfix
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/121
2021-10-16 23:18:28 +00:00
Nutbuster d229795505 punc 2021-10-17 10:17:18 +11:00
Nutbuster a21851b810 Nio's Your -> You're 2021-10-17 10:08:40 +11:00
Nutbuster 8638ffc01b Merge branch 'MU6_Hotfix' of https://git.snootgame.xyz/Cavemanon/SnootGame into MU6_Hotfix 2021-10-17 10:06:16 +11:00
Nutbuster 988513b3a0 Merge pull request 'Updates version for new hotfix' (#120) from unbroken-hymen into MU6_Hotfix
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/120
2021-10-16 23:05:17 +00:00
Nutbuster 19bb05aa43 Merge branch 'MU6_Hotfix' into unbroken-hymen 2021-10-16 23:04:54 +00:00
Nutbuster 5bb892394b 13C revision 2021-10-17 10:03:27 +11:00
Nutbuster e479698018 Merge branch 'master' into unbroken-hymen 2021-10-16 22:38:24 +00:00
MichaelYick 72d87a1189 boomer zoomer doomer redpilled tradcath hymen unbroken fang is my
tradcath waifu!
2021-10-16 17:31:42 -05:00
Nutbuster a18b6c9f33 Merge pull request 'Flash the bonus chapters button everytime you get an ending' (#118) from nutbuster/SnootGame:MU6_Hotfix into MU6_Hotfix
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/118
2021-10-16 21:06:39 +00:00
Nutbuster 4dc44ccaad Merge branch 'master' of https://git.snootgame.xyz/Cavemanon/SnootGame 2021-10-17 04:30:29 +11:00
Nutbuster bce3e15c7f Bonus Chapters flash 2021-10-17 04:25:12 +11:00
Nutbuster 2d53351106 Merge pull request 'Ending 3 - Music keeps playing fix' (#117) from nutbuster/SnootGame:master into master
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/117
2021-10-16 06:48:27 +00:00
Nutbuster 5dfe9d0628 stop the right channel music -> music1 2021-10-16 17:46:42 +11:00
Nutbuster c3cd05be49 Merge pull request 'give Fang the pendant for later RAYmba scene and whole of Trish III' (#111) from fang-pendant-fix into master
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/111
2021-10-15 19:16:48 +00:00
Bowie 43a32a3175 give Fang the pendant for later RAYmba scene and whole of Trish III 2021-10-15 19:34:17 +01:00
Nutbuster 441bd44cfe revert 1of4 -> e1of4 2021-10-15 16:44:13 +11:00
Nutbuster 59a765901e 12.5A 2021-10-15 16:09:14 +11:00
MichaelYick 6639a19c0b Merge branch 'Monster-Update-6' 2021-10-14 23:26:05 -05:00
MichaelYick 9ac4e03f08 map updates 2021-10-14 22:41:42 -05:00
Nutbuster 377894db98 Merge pull request 'Fang -> Lucy & Naomi fix, 12.5CD chapters added' (#110) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/110
2021-10-15 02:44:17 +00:00
Nutbuster af033ada9e Fang -> Lucy & Naomi fix, 12.5CD chapters added
Fang -> Lucy, including Fang's Mom & Fang's Dad -> Lucy's ..
Naomi in 13C "Oh, come on, you're in..."
2021-10-15 13:16:42 +11:00
Nutbuster a88b2fc919 Merge pull request 'lets-fucking-go' (#109) from lets-fucking-go into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/109
2021-10-14 22:35:50 +00:00
Bowie 657e0c5ea1 remove 1337 hax 2021-10-14 22:39:27 +01:00
Bowie 042065be54 remove semicolons from python wtf 2021-10-14 22:36:07 +01:00
Bowie 080ca299c0 Merge branch 'Monster-Update-6' into lets-fucking-go 2021-10-14 22:25:50 +01:00
Bowie fb3f2c5c7e remove dupe & unused sfx, work in final changes before release 2021-10-14 21:58:12 +01:00
Nutbuster 55825bc6ac Merge pull request 'Save incomptibility' (#107) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/107
2021-10-14 19:45:25 +00:00
Nutbuster 178be91261 Merge branch 'Monster-Update-6' of https://git.snootgame.xyz/Cavemanon/SnootGame into Monster-Update-6 2021-10-15 06:42:12 +11:00
Nutbuster 671ef6486a Saves Directory change & Changed endings filename 2021-10-15 06:41:52 +11:00
Nutbuster 7415eb1313 Merge pull request 'Punctuation & Missing Fang' (#106) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/106
2021-10-14 05:55:41 +00:00
Nutbuster a77f97a565 Lyrics punc 2021-10-14 16:53:58 +11:00
Nutbuster 5bbf9b8020 Punctuation and smaller capitalization fixes 2021-10-14 13:12:48 +11:00
Nutbuster 7b05c1a594 Attribute line to Fang 2021-10-14 12:01:28 +11:00
Nutbuster 4d1f2aa182 Merge pull request 'make the Fang supporting Anon sprite visible for longer as requested, add OST cover' (#105) from Bowie/SnootGame:chapter-9-adjustment into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/105
2021-10-13 22:27:04 +00:00
Nutbuster 333c6ad184 Merge branch 'Monster-Update-6' into chapter-9-adjustment 2021-10-13 22:10:47 +00:00
Bowie 01f024cb14 add Good Faith cover 2021-10-13 22:58:17 +01:00
Bowie b65f419dfd make the Fang supporting Anon sprite visible for longer as requested 2021-10-13 22:49:19 +01:00
Nutbuster db885c837c Merge pull request 'Change RAYmba BG, fixes #103' (#104) from Bowie/SnootGame:raymba-bg-change into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/104
2021-10-13 21:47:44 +00:00
Bowie be808a8607 change BG for interim scenes etc., tweak raymba to show shadow for carpeted scenes 2021-10-13 22:11:59 +01:00
Nutbuster a6fd0e9099 Merge pull request 'added back Rip Large' (#101) from Nio/SnootGame_w_ExtrasMenu:NioFT2 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/101
2021-10-13 20:08:25 +00:00
Nio f1ed86514a Merge branch 'Monster-Update-6' into NioFT2 2021-10-13 13:17:00 +00:00
Nio 68953aefb2 resolve issue #100 2021-10-13 23:04:35 +11:00
Nio 9c887f6c8a added back Rip Large 2021-10-13 21:57:28 +11:00
Nutbuster 23a30dcf14 Merge pull request 'Rename finalamp & Move into notforkids folder' (#99) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/99
2021-10-13 01:30:21 +00:00
Nutbuster e7de17809e lewd move 2021-10-13 12:27:31 +11:00
Nutbuster 8b6fda5952 Merge pull request 'MAPWork' (#98) from MAPWork into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/98
2021-10-13 01:09:15 +00:00
Bowie 7f498e223c fix crash after fire alarm scene due to debug labels 2021-10-12 21:46:50 +01:00