Merge branch 'master' of https://github.com/KadeDev/Kade-Engine into …

…KadeDev-master

assets/preload/data/blammed/0.offset

@@ -0,0 +1 @@
+

assets/preload/data/bopeebo/0.offset

@@ -0,0 +1 @@
+

assets/preload/data/cocoa/0.offset

@@ -0,0 +1 @@
+

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

@@ -1 +1 @@
-{"song":{"sectionLengths":[],"player1":"bf-christmas","gfVersion":"gf-christmas","player2":"parents-christmas","notes":[{"typeOfSection":0,"sectionNotes":[[0,0,0],[600,2,0],[1350,1,0],[1650,3,0],[2100,0,0]],"lengthInSteps":16,"altAnim":false,"bpm":95,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[3000,2,0],[3750,1,0],[4050,3,0],[4500,0,0],[2400,0,0]],"lengthInSteps":16,"altAnim":false,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[4800,0,0],[5400,2,0],[5700,0,0],[6300,2,0],[6600,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[7200,2,0],[7500,0,0],[8100,2,0],[8400,0,0],[9000,2,0],[9300,1,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[9600,0,0],[10200,2,0],[10950,1,0],[11250,3,0],[11700,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[12600,2,0],[13350,1,0],[13650,3,0],[14100,0,0],[12000,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[14400,0,0],[15000,2,0],[15300,0,0],[15900,2,0],[16200,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[16800,2,0],[17100,0,0],[17700,2,0],[18000,0,0],[18600,2,0],[18900,1,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[19500,3,150],[19800,1,450],[20400,2,1050]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[22500,1,0],[23100,1,0],[23400,3,0],[23700,1,0]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[24000,0,0],[24600,2,0],[24900,0,0],[25500,2,0],[25800,0,0]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[26400,2,0],[26700,0,0],[27300,2,0],[27600,0,0],[28200,2,0],[28500,1,0]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[29100,3,150],[29400,1,450],[30000,2,1050]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[32100,1,0],[32700,1,0],[33000,3,0],[33300,1,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[33600,0,0],[34200,2,0],[34500,0,0],[35100,2,0],[35400,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[36000,2,0],[36300,0,0],[36900,2,0],[37200,0,0],[37800,2,0],[38100,1,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[39000,0,0],[39450,3,0],[40500,0,0],[40050,2,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[40800,1,0],[41400,0,0],[41850,3,0],[42450,2,0],[42900,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[43800,0,0],[44250,3,0],[44850,2,0],[45300,0,0],[43200,1,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[45600,0,0],[46950,0,0],[47100,3,0],[47400,0,0],[46050,0,0],[46200,3,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[48600,0,0],[49050,3,0],[50100,0,0],[49650,2,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[50400,1,0],[51000,0,0],[51450,3,0],[52050,2,0],[52500,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[53400,0,0],[53850,3,0],[54450,2,0],[54900,0,0],[52800,1,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[55200,0,0],[56550,0,0],[56700,3,0],[57000,0,0],[55650,0,0],[55800,3,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[57750,0,0],[58200,2,300],[58800,3,450],[59400,2,150],[59700,0,450]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[60600,2,300],[61200,3,300],[61800,2,300]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[62400,0,0],[63000,2,0],[63300,0,0],[63900,2,0],[64200,0,0]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[64800,2,0],[65100,0,0],[65700,2,0],[66000,0,0],[66600,2,0],[66900,1,0]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[67350,0,0],[67800,2,300],[68400,3,450],[69000,2,150],[69300,0,450]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[70200,2,300],[70800,3,300],[71400,2,300]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[72000,0,0],[72600,2,0],[72900,0,0],[73500,2,0],[73800,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[74400,2,0],[74700,0,0],[75300,2,0],[75600,0,0],[76200,2,0],[76500,1,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[76800,0,0],[77400,2,0],[78150,1,0],[78450,3,0],[78900,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[79800,2,0],[80550,1,0],[80850,3,0],[81300,0,0],[79200,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[81600,0,0],[82200,2,0],[82950,1,0],[83250,3,0],[83700,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[84600,2,0],[85350,1,0],[85650,3,0],[86100,0,0],[84000,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[86400,0,0],[86700,3,0],[87300,3,0],[87900,3,0],[88050,1,0],[88500,3,0],[87600,0,0]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[88800,0,0],[89100,3,0],[89700,3,0],[89850,2,0],[91050,0,450],[90600,3,0],[90000,3,0]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[91200,0,0],[91500,3,0],[92100,3,0],[92700,3,0],[92850,1,0],[93300,3,0],[92400,0,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[93600,0,0],[93900,3,0],[94500,3,0],[94650,2,0],[95850,0,450],[95400,3,0],[94800,3,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[96000,0,0],[96300,3,0],[96900,3,0],[97500,3,0],[97650,1,0],[98100,3,0],[97200,0,0]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[98400,0,0],[98700,3,0],[99300,3,0],[99450,2,0],[100650,0,450],[100200,3,0],[99600,3,0]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":false},{"typeOfSection":0,"sectionNotes":[[100800,0,0],[101100,3,0],[101700,3,0],[102300,3,0],[102450,1,0],[102900,3,0],[102000,0,0]],"lengthInSteps":16,"altAnim":true,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[103200,0,0],[103500,3,0],[104100,3,0],[104250,2,0],[105450,0,450],[105000,3,0],[104400,3,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[105600,3,600]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[],"lengthInSteps":16,"altAnim":false,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[],"lengthInSteps":16,"altAnim":false,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[],"lengthInSteps":16,"altAnim":false,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[],"lengthInSteps":16,"altAnim":false,"bpm":100,"changeBPM":false,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[],"lengthInSteps":16,"altAnim":false,"bpm":100,"changeBPM":false,"mustHitSection":true},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[],"bpm":100,"changeBPM":false,"mustHitSection":true}],"song":"Cocoa","stage":"mall","validScore":true,"sections":0,"needsVoices":true,"speed":1.3,"bpm":100}}
+{"song":{"player1":"bf-christmas","gfVersion":"gf-christmas","notes":[{"sectionNotes":[[0,0,0],[600,2,0],[1350,1,0],[1650,3,0],[2100,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[2400,0,0],[3000,2,0],[3750,1,0],[4050,3,0],[4500,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[4800,0,0],[5400,2,0],[5700,0,0],[6300,2,0],[6600,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[7200,2,0],[7500,0,0],[8100,2,0],[8400,0,0],[9000,2,0],[9300,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[9600,0,0],[10200,2,0],[10950,1,0],[11250,3,0],[11700,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[12000,0,0],[12600,2,0],[13350,1,0],[13650,3,0],[14100,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[14400,0,0],[15000,2,0],[15300,0,0],[15900,2,0],[16200,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[16800,2,0],[17100,0,0],[17700,2,0],[18000,0,0],[18600,2,0],[18900,1,0]],"lengthInSteps":16,"mustHitSection":true},{"altAnim":true,"sectionNotes":[[19500,3,150],[19800,1,450],[20400,2,1050]],"lengthInSteps":16,"mustHitSection":false},{"altAnim":true,"sectionNotes":[[22500,1,0],[23100,1,0],[23400,3,0],[23700,1,0]],"lengthInSteps":16,"mustHitSection":false},{"altAnim":true,"sectionNotes":[[24000,0,0],[24600,2,0],[24900,0,0],[25500,2,0],[25800,0,0]],"lengthInSteps":16,"mustHitSection":false},{"altAnim":true,"sectionNotes":[[26400,2,0],[26700,0,0],[27300,2,0],[27600,0,0],[28200,2,0],[28500,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[28800,6,600],[29100,3,150],[29400,1,450],[30000,2,1050]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[32100,1,0],[32700,1,0],[33000,3,0],[33300,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[33600,0,0],[34200,2,0],[34500,0,0],[35100,2,0],[35400,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[36000,2,0],[36300,0,0],[36900,2,0],[37200,0,0],[37800,2,0],[38100,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[39000,0,0],[39450,3,0],[40050,2,0],[40500,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[40800,1,0],[41400,0,0],[41850,3,0],[42450,2,0],[42900,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[43200,1,0],[43800,0,0],[44250,3,0],[44850,2,0],[45300,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[45600,0,0],[46050,0,0],[46200,3,0],[46950,0,0],[47100,3,0],[47400,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[48600,0,0],[49050,3,0],[49650,2,0],[50100,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[50400,1,0],[51000,0,0],[51450,3,0],[52050,2,0],[52500,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[52800,1,0],[53400,0,0],[53850,3,0],[54450,2,0],[54900,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[55200,0,0],[55650,0,0],[55800,3,0],[56550,0,0],[56700,3,0],[57000,0,0]],"lengthInSteps":16,"mustHitSection":true},{"altAnim":true,"sectionNotes":[[57750,0,0],[58200,2,450],[58800,3,450],[59400,2,150],[59700,0,750]],"lengthInSteps":16,"mustHitSection":false},{"altAnim":true,"sectionNotes":[[60600,2,300],[61200,3,450],[61800,2,450]],"lengthInSteps":16,"mustHitSection":false},{"altAnim":true,"sectionNotes":[[62400,0,0],[63000,2,0],[63300,0,0],[63900,2,0],[64200,0,0]],"lengthInSteps":16,"mustHitSection":false},{"altAnim":true,"sectionNotes":[[64800,2,0],[65100,0,0],[65700,2,0],[66000,0,0],[66600,2,0],[66900,1,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[67350,0,0],[67800,2,450],[68400,3,450],[69000,2,150],[69300,0,750]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[70200,2,300],[70800,3,450],[71400,2,450]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[72000,0,0],[72600,2,0],[72900,0,0],[73500,2,0],[73800,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[74400,2,0],[74700,0,0],[75300,2,0],[75600,0,0],[76200,2,0],[76500,1,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[76800,0,0],[77400,2,0],[78150,1,0],[78450,3,0],[78900,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[79200,0,0],[79800,2,0],[80550,1,0],[80850,3,0],[81300,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[81600,0,0],[82200,2,0],[82950,1,0],[83250,3,0],[83700,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[84000,0,0],[84600,2,0],[85350,1,0],[85650,3,0],[86100,0,0]],"lengthInSteps":16,"mustHitSection":true},{"altAnim":true,"sectionNotes":[[86400,0,0],[86700,3,0],[87300,3,0],[87600,0,0],[87900,3,0],[88200,3,0],[88500,3,0]],"lengthInSteps":16,"mustHitSection":false},{"altAnim":true,"sectionNotes":[[88800,0,0],[89100,3,0],[89700,3,0],[90000,3,0],[90600,3,0],[90900,2,0],[91050,0,0]],"lengthInSteps":16,"mustHitSection":false},{"sectionNotes":[[91200,0,0],[91500,3,0],[92100,3,0],[92400,0,0],[92700,3,0],[93000,3,0],[93300,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[93600,0,0],[93900,3,0],[94500,3,0],[94800,3,0],[95400,3,0],[95700,2,0],[95850,0,0]],"lengthInSteps":16,"mustHitSection":true},{"altAnim":true,"sectionNotes":[[96000,0,0],[96300,3,0],[96900,3,0],[97200,0,0],[97500,3,0],[97800,3,0],[98100,3,0]],"lengthInSteps":16,"mustHitSection":false},{"altAnim":true,"sectionNotes":[[98400,0,0],[98700,3,0],[99300,3,0],[99600,3,0],[100200,3,0],[100500,2,0],[100650,0,0]],"lengthInSteps":16,"mustHitSection":false},{"altAnim":true,"sectionNotes":[[100800,7,600],[100800,0,0],[101100,3,0],[101700,3,0],[102000,0,0],[102300,3,0],[102600,3,0],[102900,3,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[103200,0,0],[103500,3,0],[104100,3,0],[104400,3,0],[105000,3,0],[105300,2,0],[105450,0,0]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[[105600,3,600]],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"mustHitSection":true},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[],"bpm":100,"changeBPM":false,"mustHitSection":true}],"player2":"parents-christmas","song":"Cocoa","stage":"mall","needsVoices":true,"validScore":true,"bpm":100,"speed":1.3}}