Commit Graph

801 Commits

Author SHA1 Message Date
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 ffb432eb38 Merge pull request 're-added contributing guidelines' (#126) from newReadme into master
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/126
2021-10-22 01:59:02 +00:00
MichaelYick 8654b65f52 re-added contributing guidelines 2021-10-21 20:41:36 -05:00
Nutbuster 05b95494cd Merge branch 'master' of https://git.snootgame.xyz/Cavemanon/SnootGame into FinalFantasy7 2021-10-22 04:40:48 +11:00
Nutbuster 85b0107b29 Merge pull request 'Delete README because it's inaccurate' (#125) from nutbuster/SnootGame:master into master
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/125
2021-10-21 17:40:02 +00:00
Nutbuster 864f40f6ee Merge branch 'master' into master 2021-10-21 17:39:00 +00:00
Nutbuster 04785e0f67 Delete README because it's inaccurate 2021-10-21 17:27:01 +00: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