Merge branch 'deferred_loading' of https://github.com/Geokureli/Funkin into Geokureli-deferred_loading

Browse Source

...

This commit is contained in:

Cameron Taylor

2021-02-23 23:34:08 -05:00

parent 4bd6994515 1bc83d7a2d

commit ba1df3c237

465 changed files with 697 additions and 229 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

assets/music/Monster.mp3 → assets/exclude/music/Monster.mp3

0

assets/music/Monster.ogg → assets/exclude/music/Monster.ogg

0

assets/music/Spookeez.mp3 → assets/exclude/music/Spookeez.mp3

0

assets/music/Spookeez.ogg → assets/exclude/music/Spookeez.ogg

0

assets/music/title.mp3 → assets/exclude/music/title.mp3

0

assets/music/title.ogg → assets/exclude/music/title.ogg

0

assets/music/titleShoot.mp3 → assets/exclude/music/titleShoot.mp3

0

assets/music/titleShoot.ogg → assets/exclude/music/titleShoot.ogg

0

assets/sounds/freshIntro.mp3 → assets/exclude/sounds/freshIntro.mp3

0

assets/sounds/freshIntro.ogg → assets/exclude/sounds/freshIntro.ogg

0

assets/data/blammed/blammed-easy.json → assets/preload/data/blammed/blammed-easy.json

0

assets/data/blammed/blammed-hard.json → assets/preload/data/blammed/blammed-hard.json

0

assets/data/blammed/blammed.json → assets/preload/data/blammed/blammed.json

0

assets/data/bopeebo/bopeebo-easy.json → assets/preload/data/bopeebo/bopeebo-easy.json

0

assets/data/bopeebo/bopeebo-hard.json → assets/preload/data/bopeebo/bopeebo-hard.json

0

assets/data/bopeebo/bopeebo.json → assets/preload/data/bopeebo/bopeebo.json

0

assets/data/characterList.txt → assets/preload/data/characterList.txt

0

assets/data/cocoa/cocoa-easy.json → assets/preload/data/cocoa/cocoa-easy.json

0

assets/data/cocoa/cocoa-hard.json → assets/preload/data/cocoa/cocoa-hard.json

0

assets/data/cocoa/cocoa.json → assets/preload/data/cocoa/cocoa.json

0

assets/data/controls.txt → assets/preload/data/controls.txt

0

assets/data/dadbattle/dadbattle-easy.json → assets/preload/data/dadbattle/dadbattle-easy.json

0

assets/data/dadbattle/dadbattle-hard.json → assets/preload/data/dadbattle/dadbattle-hard.json

0

assets/data/dadbattle/dadbattle.json → assets/preload/data/dadbattle/dadbattle.json

0

assets/data/data-goes-here.txt → assets/preload/data/data-goes-here.txt

0

assets/data/eggnog/eggnog-easy.json → assets/preload/data/eggnog/eggnog-easy.json

0

assets/data/eggnog/eggnog-hard.json → assets/preload/data/eggnog/eggnog-hard.json

0

assets/data/eggnog/eggnog.json → assets/preload/data/eggnog/eggnog.json

0

assets/data/freeplaySonglist.txt → assets/preload/data/freeplaySonglist.txt

0

assets/data/fresh/fresh-easy.json → assets/preload/data/fresh/fresh-easy.json

0

assets/data/fresh/fresh-hard.json → assets/preload/data/fresh/fresh-hard.json

0

assets/data/fresh/fresh.json → assets/preload/data/fresh/fresh.json

0

assets/data/high/high-easy.json → assets/preload/data/high/high-easy.json

0

assets/data/high/high-hard.json → assets/preload/data/high/high-hard.json

0

assets/data/high/high.json → assets/preload/data/high/high.json

0

assets/data/introText.txt → assets/preload/data/introText.txt

0

assets/data/main-view.xml → assets/preload/data/main-view.xml

0

assets/data/milf/milf-easy.json → assets/preload/data/milf/milf-easy.json

0

assets/data/milf/milf-hard.json → assets/preload/data/milf/milf-hard.json

0

assets/data/milf/milf.json → assets/preload/data/milf/milf.json

0

assets/data/monster/monster.json → assets/preload/data/monster/monster.json

0

assets/data/philly/philly-easy.json → assets/preload/data/philly/philly-easy.json

0

assets/data/philly/philly-hard.json → assets/preload/data/philly/philly-hard.json

0

assets/data/philly/philly.json → assets/preload/data/philly/philly.json

0

assets/data/pico/pico-easy.json → assets/preload/data/pico/pico-easy.json

0

assets/data/pico/pico-hard.json → assets/preload/data/pico/pico-hard.json

0

assets/data/pico/pico.json → assets/preload/data/pico/pico.json

0

assets/data/ridge/ridge.json → assets/preload/data/ridge/ridge.json

0

assets/data/roses/roses-easy.json → assets/preload/data/roses/roses-easy.json

0

assets/data/roses/roses-hard.json → assets/preload/data/roses/roses-hard.json

0

assets/data/roses/roses.json → assets/preload/data/roses/roses.json

0

assets/data/roses/rosesDialogue.txt → assets/preload/data/roses/rosesDialogue.txt

0

assets/data/satin-panties/satin-panties-easy.json → assets/preload/data/satin-panties/satin-panties-easy.json

0

assets/data/satin-panties/satin-panties-hard.json → assets/preload/data/satin-panties/satin-panties-hard.json

0

assets/data/satin-panties/satin-panties.json → assets/preload/data/satin-panties/satin-panties.json

0

assets/data/senpai/senpai-easy.json → assets/preload/data/senpai/senpai-easy.json

0

assets/data/senpai/senpai-hard.json → assets/preload/data/senpai/senpai-hard.json

0

assets/data/senpai/senpai.json → assets/preload/data/senpai/senpai.json

0

assets/data/senpai/senpaiDialogue.txt → assets/preload/data/senpai/senpaiDialogue.txt

0

assets/data/smash/smash.json → assets/preload/data/smash/smash.json

0

assets/data/south/south-easy.json → assets/preload/data/south/south-easy.json

0

assets/data/south/south-hard.json → assets/preload/data/south/south-hard.json

0

assets/data/south/south.json → assets/preload/data/south/south.json

0

assets/data/specialThanks.txt → assets/preload/data/specialThanks.txt

0

assets/data/spookeez/spookeez-easy.json → assets/preload/data/spookeez/spookeez-easy.json

0

assets/data/spookeez/spookeez-hard.json → assets/preload/data/spookeez/spookeez-hard.json

0

assets/data/spookeez/spookeez.json → assets/preload/data/spookeez/spookeez.json

0

assets/data/thorns/thorns-easy.json → assets/preload/data/thorns/thorns-easy.json

0

assets/data/thorns/thorns-hard.json → assets/preload/data/thorns/thorns-hard.json

0

assets/data/thorns/thorns.json → assets/preload/data/thorns/thorns.json

0

assets/data/thorns/thornsDialogue.txt → assets/preload/data/thorns/thornsDialogue.txt

0

assets/data/tutorial/tutorial-easy.json → assets/preload/data/tutorial/tutorial-easy.json

0

assets/data/tutorial/tutorial-hard.json → assets/preload/data/tutorial/tutorial-hard.json

0

assets/data/tutorial/tutorial.json → assets/preload/data/tutorial/tutorial.json

0

assets/data/winter-horrorland/winter-horrorland-easy.json → assets/preload/data/winter-horrorland/winter-horrorland-easy.json

0

assets/data/winter-horrorland/winter-horrorland-hard.json → assets/preload/data/winter-horrorland/winter-horrorland-hard.json

0

assets/data/winter-horrorland/winter-horrorland.json → assets/preload/data/winter-horrorland/winter-horrorland.json

0

assets/images/FNF_main_menu_assets.png → assets/preload/images/FNF_main_menu_assets.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 275 KiB After Width:  |  Height:  |  Size: 275 KiB

0

assets/images/FNF_main_menu_assets.xml → assets/preload/images/FNF_main_menu_assets.xml

0

assets/images/alphabet.png → assets/preload/images/alphabet.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 137 KiB After Width:  |  Height:  |  Size: 137 KiB

0

assets/images/alphabet.xml → assets/preload/images/alphabet.xml

0

assets/images/campaign_menu_UI_assets.png → assets/preload/images/campaign_menu_UI_assets.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 125 KiB After Width:  |  Height:  |  Size: 125 KiB

0

assets/images/campaign_menu_UI_assets.xml → assets/preload/images/campaign_menu_UI_assets.xml

0

assets/images/campaign_menu_UI_characters.png → assets/preload/images/campaign_menu_UI_characters.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.2 MiB After Width:  |  Height:  |  Size: 2.2 MiB

0

assets/images/campaign_menu_UI_characters.xml → assets/preload/images/campaign_menu_UI_characters.xml

0

assets/images/gfDanceTitle.png → assets/preload/images/gfDanceTitle.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 MiB After Width:  |  Height:  |  Size: 1.2 MiB

0

assets/images/gfDanceTitle.xml → assets/preload/images/gfDanceTitle.xml

0

assets/images/logo.png → assets/preload/images/logo.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 85 KiB After Width:  |  Height:  |  Size: 85 KiB

0

assets/images/logoBumpin.png → assets/preload/images/logoBumpin.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 579 KiB After Width:  |  Height:  |  Size: 579 KiB

0

assets/images/logoBumpin.xml → assets/preload/images/logoBumpin.xml

0

assets/images/menuBG.png → assets/preload/images/menuBG.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 606 KiB After Width:  |  Height:  |  Size: 606 KiB

0

assets/images/menuBGBlue.png → assets/preload/images/menuBGBlue.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 600 KiB After Width:  |  Height:  |  Size: 600 KiB

0

assets/images/menuBGMagenta.png → assets/preload/images/menuBGMagenta.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 540 KiB After Width:  |  Height:  |  Size: 540 KiB

0

assets/images/menuDesat.png → assets/preload/images/menuDesat.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 350 KiB After Width:  |  Height:  |  Size: 350 KiB

0

assets/images/newgrounds_logo.png → assets/preload/images/newgrounds_logo.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 56 KiB After Width:  |  Height:  |  Size: 56 KiB

0

assets/images/num0.png → assets/preload/images/num0.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 3.7 KiB

0

assets/images/num1.png → assets/preload/images/num1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 3.3 KiB

0

assets/images/num2.png → assets/preload/images/num2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 3.9 KiB

0

assets/images/num3.png → assets/preload/images/num3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 3.9 KiB

0

assets/images/num4.png → assets/preload/images/num4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 3.9 KiB

Some files were not shown because too many files have changed in this diff Show More