Commit Graph

675 Commits

Author SHA1 Message Date
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
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