Merge branch 'master' into master

2020-11-02 15:37:55 -08:00
parent 2fcc73e387 589db1f26b
commit 9ccf971e58
25 changed files with 24 additions and 2 deletions
--- a/assets/data/ridge/ridge.json
+++ b/assets/data/ridge/ridge.json
--- a/assets/data/section1.aseprite
+++ b/assets/data/section1.aseprite
--- a/assets/data/south/south.json
+++ b/assets/data/south/south.json
--- a/assets/images/ape_FNF.png
+++ b/assets/images/ape_FNF.png
--- a/assets/images/bg.png
+++ b/assets/images/bg.png
--- a/assets/music/Bopeebo.mp3
+++ b/assets/music/Bopeebo.mp3
--- a/assets/music/Bopeebo.ogg
+++ b/assets/music/Bopeebo.ogg
--- a/assets/music/Fresh.mp3
+++ b/assets/music/Fresh.mp3
--- a/assets/music/Fresh.ogg
+++ b/assets/music/Fresh.ogg
--- a/assets/music/GAME_OVER_Dont_Stop.mp3
+++ b/assets/music/GAME_OVER_Dont_Stop.mp3
--- a/assets/music/GAME_OVER_Dont_Stop_END_PART.mp3
+++ b/assets/music/GAME_OVER_Dont_Stop_END_PART.mp3
--- a/assets/music/Smash.mp3
+++ b/assets/music/Smash.mp3
--- a/assets/music/Smash_Inst.mp3
+++ b/assets/music/Smash_Inst.mp3
--- a/assets/music/Smash_Voices.mp3
+++ b/assets/music/Smash_Voices.mp3
--- a/assets/music/Tutorial.mp3
+++ b/assets/music/Tutorial.mp3
--- a/assets/music/Tutorial.ogg
+++ b/assets/music/Tutorial.ogg
--- a/assets/music/Tutorial_Voices.mp3
+++ b/assets/music/Tutorial_Voices.mp3
--- a/assets/music/Tutorial_Voices.ogg
+++ b/assets/music/Tutorial_Voices.ogg