Skip to content

Commit

Permalink
Merge pull request #1439 from zacksgamerz/patch-6 (zack is a chad)
Browse files Browse the repository at this point in the history
Dont merge this yet luck, I still haven't moved the 2.8 code
  • Loading branch information
luckydog7 authored Jun 29, 2021
2 parents 7f49f2f + 7d8df5b commit 8e0ca13
Show file tree
Hide file tree
Showing 117 changed files with 4,564 additions and 527 deletions.
2 changes: 1 addition & 1 deletion Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project>
<!-- _________________________ Application Settings _________________________ -->

<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" package="com.ninjamuffin99.funkin" main="Main" version="0.2.7.1" company="ninjamuffin99" />
<app title="Friday Night Funkin'" file="funkin" packageName="com.ninjamuffin99.funkin" package="com.ninjamuffin99.funkin" main="Main" version="0.2.7.1" company="ninjamuffin99" />

<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />
Expand Down
1 change: 1 addition & 0 deletions assets/preload/data/guns/Guns
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions assets/preload/data/guns/guns-easy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"song":{"song":"Guns","bpm":185.0,"needsVoices":true,"player1":"bf","player2":"tankman","speed":1.4,"notes":[{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[10378.3779,1,0.0],[10702.7021,1,0.0],[11027.0264,3,0.0],[11351.3506,0,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[11675.6748,1,0.0],[11999.999,1,0.0],[12324.3232,3,0.0],[12648.6475,0,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[12972.9717,1,0.0],[13297.2969,3,0.0],[13621.6211,0,0.0],[13945.9453,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[14270.27,3,0.0],[14594.5938,2,0.0],[14918.918,0,0.0],[15243.2422,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[15567.5664,1,0.0],[15891.8906,1,0.0],[16216.2148,3,0.0],[16540.54,0,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[16864.8633,1,0.0],[17189.1875,1,0.0],[17513.5117,3,0.0],[17837.8359,0,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[18162.16,1,0.0],[18486.4844,3,0.0],[18810.8086,0,0.0],[19135.1348,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[19459.459,3,0.0],[19783.7832,2,0.0],[20108.1074,0,0.0],[20432.4316,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[20756.7559,0,0.0],[21081.08,1,0.0],[21405.4043,0,0.0],[21729.7285,3,0.0],[21891.89,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[22054.0527,0,0.0],[22378.377,3,0.0],[22540.54,1,0.0],[22702.7012,0,0.0],[23027.0254,3,0.0],[23189.1875,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[23351.35,0,0.0],[23675.6738,1,0.0],[23999.998,0,0.0],[24324.3223,3,0.0],[24486.4844,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[24648.6465,0,0.0],[24972.97,0,0.0],[25297.2949,3,0.0],[25459.457,1,0.0],[25621.62,0,0.0],[25783.7813,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[25945.9434,0,0.0],[26270.2676,1,0.0],[26594.5938,0,0.0],[26918.918,3,0.0],[27081.08,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[27243.2422,0,0.0],[27567.5664,3,0.0],[27729.7285,1,0.0],[27891.89,0,0.0],[28216.2148,3,0.0],[28378.377,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[28540.54,0,0.0],[28864.8633,1,0.0],[29189.1875,0,0.0],[29513.5117,3,0.0],[29675.6738,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[29837.8359,0,0.0],[30162.16,0,0.0],[30486.4844,3,0.0],[30648.6465,1,0.0],[30810.8086,0,0.0],[30972.97,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[31135.1328,3,0.0],[31459.457,0,0.0],[31783.7813,3,0.0],[32108.1055,0,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[32432.43,3,0.0],[32594.5918,1,0.0],[32756.7539,0,0.0],[32918.918,1,0.0],[33081.08,3,0.0],[33405.4023,0,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[33729.7266,3,0.0],[33729.7266,6,648.6486],[34054.05,0,0.0],[34378.375,3,0.0],[34702.7,0,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[35027.0234,3,0.0],[35027.0234,5,567.5675],[35189.1875,1,0.0],[35351.3477,0,0.0],[35513.51,1,0.0],[35675.67,3,0.0],[35675.67,4,486.48645],[35999.9961,0,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[36324.32,3,0.0],[36648.6445,0,0.0],[36972.97,3,0.0],[37297.293,0,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[37621.6172,3,0.0],[37783.78,1,0.0],[37945.9453,0,0.0],[38108.1055,1,0.0],[38270.27,3,0.0],[38594.5938,0,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[38918.918,3,0.0],[39243.2422,0,0.0],[39567.5664,3,0.0],[39891.89,0,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[40216.2148,3,0.0],[40378.375,1,0.0],[40540.54,0,0.0],[40702.7,1,0.0],[40864.8633,3,0.0],[41189.1875,0,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[41513.51,0,0.0],[41513.51,5,648.6486],[41837.8359,3,0.0],[41999.9961,2,0.0],[42162.16,3,0.0],[42486.4844,0,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[42810.81,3,0.0],[43135.1328,1,0.0],[43459.457,3,0.0],[43783.78,0,0.0],[43945.94,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[44108.1055,0,0.0],[44432.43,3,0.0],[44594.59,2,0.0],[44756.7539,3,0.0],[45081.08,0,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[45405.4023,3,0.0],[45405.4023,5,567.5675],[45729.7266,1,0.0],[46054.05,3,0.0],[46054.05,4,567.5675],[46378.375,0,0.0],[46540.54,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[46702.7,0,0.0],[47027.0234,3,0.0],[47189.1875,2,0.0],[47351.3477,3,0.0],[47675.67,0,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[47999.9961,3,0.0],[48324.32,1,0.0],[48648.6445,3,0.0],[48972.97,0,0.0],[49135.1328,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[49297.293,0,0.0],[49621.6172,3,0.0],[49783.78,2,0.0],[49945.94,3,0.0],[50270.2656,0,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[50594.59,3,0.0],[50918.9141,1,0.0],[51243.24,3,0.0],[51567.5625,0,0.0],[51729.7266,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[51891.8867,1,0.0],[52216.21,3,0.0],[52540.5352,1,0.0],[52864.8633,3,0.0],[53027.0234,0,405.405365]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[53513.51,3,0.0],[53837.8359,1,0.0],[54162.16,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[54486.4844,3,0.0],[54810.81,0,0.0],[55135.1328,3,0.0],[55459.457,0,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[55783.78,1,0.0],[56108.1055,1,0.0],[56432.43,3,0.0],[56756.7539,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[57081.08,4,648.6486],[57081.08,1,0.0],[57405.4023,3,0.0],[57729.7266,1,0.0],[58054.05,3,0.0],[58216.21,0,405.405365]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[58702.7,3,0.0],[59027.0234,1,0.0],[59351.3477,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[59675.67,3,0.0],[59999.9961,0,0.0],[60324.32,3,0.0],[60648.6445,0,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[60972.97,1,0.0],[61297.293,1,0.0],[61621.6172,3,0.0],[61945.94,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[62270.2656,3,0.0],[62270.2656,4,648.6486],[62594.59,1,0.0],[62918.9141,3,0.0],[63243.24,0,0.0],[63405.4023,2,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[63567.5625,3,0.0],[63891.8867,1,0.0],[64216.21,3,0.0],[64540.5352,0,0.0],[64702.7,2,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[64864.86,3,0.0],[65189.1836,3,0.0],[65513.5078,0,0.0],[65837.8359,0,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[66162.16,2,0.0],[66324.32,3,0.0],[66486.4844,2,0.0],[66648.64,3,0.0],[66810.8047,2,0.0],[66972.97,3,0.0],[67135.13,2,0.0],[67297.29,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[67459.45,6,972.9729],[67459.45,3,0.0],[67783.78,1,0.0],[68108.1,3,0.0],[68432.43,0,0.0],[68594.59,2,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[68756.75,3,0.0],[69081.08,1,0.0],[69405.4,3,0.0],[69729.73,0,0.0],[69891.89,2,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[70054.05,3,0.0],[70378.375,3,0.0],[70702.6953,0,0.0],[71027.02,0,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[71351.34,2,0.0],[71513.51,3,0.0],[71675.67,2,0.0],[71837.8359,3,0.0],[71999.99,2,0.0],[72162.16,3,0.0],[72324.32,2,0.0],[72486.4844,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[72648.64,3,0.0],[72648.64,6,972.9729],[72972.97,2,0.0],[73135.13,3,0.0],[73297.29,0,243.243225],[73621.62,1,243.243225]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[73945.94,0,0.0],[74270.2656,3,0.0],[74432.43,1,0.0],[74594.5859,0,0.0],[74918.9141,3,0.0],[75081.08,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[75243.2344,0,0.0],[75567.56,1,0.0],[75891.89,0,0.0],[76216.21,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[76540.54,0,0.0],[76864.86,0,0.0],[77189.19,1,0.0],[77513.51,3,0.0],[77675.67,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[77837.8359,0,0.0],[78162.16,3,0.0],[78486.4844,0,0.0],[78810.8047,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[79135.13,0,0.0],[79459.45,3,0.0],[79621.62,2,0.0],[79783.78,0,0.0],[80108.1,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[80432.43,0,0.0],[80756.75,3,0.0],[81081.08,0,0.0],[81405.4,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[81729.73,0,0.0],[82054.05,3,0.0],[82216.21,2,0.0],[82378.375,0,0.0],[82702.6953,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[83027.02,3,0.0],[83351.34,2,0.0],[83513.51,3,0.0],[83675.67,0,243.243225],[83999.99,1,243.243225]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[84324.32,0,0.0],[84648.64,3,0.0],[84810.8047,1,0.0],[84972.97,0,0.0],[85297.29,3,0.0],[85459.45,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[85621.62,0,0.0],[85945.94,1,0.0],[86270.2656,0,0.0],[86594.5859,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[86918.9141,0,0.0],[87243.2344,0,0.0],[87567.56,1,0.0],[87891.88,3,0.0],[88054.05,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[88216.21,0,0.0],[88540.53,3,0.0],[88864.86,0,0.0],[89189.18,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[89513.51,0,0.0],[89837.83,3,0.0],[89999.99,2,0.0],[90162.16,0,0.0],[90486.48,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[90810.8047,0,0.0],[91135.13,3,0.0],[91459.45,0,0.0],[91783.78,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[92108.1,0,0.0],[92432.43,3,0.0],[92594.5859,2,0.0],[92756.75,0,0.0],[93081.08,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[93405.4,3,0.0],[93405.4,7,648.6486],[93729.73,2,0.0],[93891.88,3,0.0],[94054.05,0,0.0],[94378.375,1,0.0],[94540.53,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[94702.6953,0,0.0],[95027.02,1,0.0],[95351.34,3,0.0],[95675.67,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[95999.99,0,0.0],[96324.32,1,0.0],[96648.64,3,0.0],[96972.97,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[97297.29,0,0.0],[97459.45,2,0.0],[97621.62,3,0.0],[97945.94,0,0.0],[98108.1,2,0.0],[98270.2656,3,0.0],[98432.43,0,243.243225]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[98918.9141,3,0.0],[99243.2344,0,0.0],[99567.56,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[99891.88,0,0.0],[100216.211,3,0.0],[100378.375,2,0.0],[100540.531,0,0.0],[100864.859,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[101189.18,0,0.0],[101513.508,3,0.0],[101837.828,0,0.0],[102162.156,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[102486.477,0,0.0],[102810.805,3,0.0],[102972.969,2,0.0],[103135.125,0,0.0],[103459.453,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[103783.773,3,0.0],[104108.1,2,0.0],[104270.266,3,0.0],[104432.422,0,0.0],[104756.75,1,0.0],[104918.914,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[105081.07,0,0.0],[105405.4,1,0.0],[105729.727,3,0.0],[106054.047,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[106378.375,0,0.0],[106702.695,1,0.0],[107027.023,3,0.0],[107351.344,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[107675.672,0,0.0],[107837.828,2,0.0],[107999.992,3,0.0],[108324.32,0,0.0],[108486.477,2,0.0],[108648.641,3,0.0],[108810.805,0,243.243225]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[109297.289,3,0.0],[109621.617,0,0.0],[109945.938,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[110270.266,0,0.0],[110594.586,3,0.0],[110756.75,2,0.0],[110918.914,0,0.0],[111243.234,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[111567.563,0,0.0],[111891.883,3,0.0],[112216.211,0,0.0],[112540.531,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[112864.859,0,0.0],[113189.18,3,0.0],[113351.344,2,0.0],[113513.508,0,0.0],[113837.828,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[114162.156,3,0.0],[114162.156,6,648.6486],[114486.477,3,0.0],[114648.641,2,0.0],[114810.805,0,0.0],[115135.125,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[115459.453,3,0.0],[115621.617,2,0.0],[115783.773,0,0.0],[116108.1,3,0.0],[116270.266,2,0.0],[116432.422,0,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[116756.75,0,0.0],[117081.07,0,0.0],[117243.234,3,0.0],[117405.4,0,0.0],[117729.719,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[118054.047,0,0.0],[118378.367,0,0.0],[118702.695,1,0.0],[119027.016,3,0.0],[119189.18,1,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[119351.344,0,0.0],[119675.664,3,0.0],[119999.992,0,0.0],[120324.313,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[120648.641,0,0.0],[120972.969,3,0.0],[121135.125,2,0.0],[121297.289,0,0.0],[121621.617,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[121945.938,0,0.0],[122270.266,3,0.0],[122594.586,0,0.0],[122918.914,3,0.0]]},{"lengthInSteps":16,"mustHitSection":false,"sectionNotes":[[123243.234,0,0.0],[123567.563,3,0.0],[123729.719,2,0.0],[123891.883,0,0.0],[124216.211,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[124540.531,3,0.0],[124864.859,3,0.0],[125027.016,2,0.0],[125189.18,0,0.0],[125513.508,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[125837.828,3,0.0],[125999.992,2,0.0],[126162.156,0,0.0],[126486.477,3,0.0],[126648.641,2,0.0],[126810.805,0,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[127135.125,0,0.0],[127459.453,0,0.0],[127621.609,3,0.0],[127783.773,0,0.0],[128108.1,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[128432.422,0,0.0],[128756.75,0,0.0],[129081.07,1,0.0],[129405.4,3,0.0],[129567.563,1,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[129729.719,0,0.0],[130054.047,3,0.0],[130378.367,0,0.0],[130702.695,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[131027.016,0,0.0],[131351.344,3,0.0],[131513.5,2,0.0],[131675.672,0,0.0],[131999.984,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[132324.313,0,0.0],[132648.641,3,0.0],[132972.969,0,0.0],[133297.281,3,0.0]]},{"lengthInSteps":16,"mustHitSection":true,"sectionNotes":[[133621.609,0,0.0],[133945.938,3,0.0],[134108.1,2,0.0],[134270.266,0,0.0],[134594.578,3,0.0]]}]},"generatedBy":"SNIFF ver.6"}
1 change: 1 addition & 0 deletions assets/preload/data/guns/guns-hard.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/preload/data/guns/guns.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/preload/data/stress/picospeaker.json

Large diffs are not rendered by default.

258 changes: 258 additions & 0 deletions assets/preload/data/stress/picospeakerStepsR.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,258 @@
2
3
5
9
10
16
22
25
26
34
35
37
41
42
48
54
57
58
66
67
69
73
74
80
86
89
90
98
99
101
105
106
112
118
121
122
253
260
268
280
284
292
300
312
316
317
318
320
332
336
344
358
360
362
364
372
376
388
396
404
408
412
420
428
436
440
444
452
456
460
468
472
476
484
488
492
456
460
468
472
476
484
488
492
508
509
510
516
520
524
532
540
548
552
556
564
568
572
580
584
588
596
604
612
616
620
636
637
638
642
643
645
649
650
656
662
665
666
674
675
677
681
682
688
694
697
698
706
707
709
713
714
720
726
729
730
738
739
741
745
746
753
758
761
762
768
788
792
796
800
820
824
828
829
830
832
852
856
860
861
862
864
865
866
884
885
886
887
892
900
912
916
924
926
936
948
958
962
966
970
974
976
980
984
988
990
1000
1004
1006
1008
1012
1019
1028
1036
1044
1052
1060
1068
1076
1084
1092
1100
1108
1116
1124
1132
1148
1149
1150
1156
1160
1164
1172
1180
1188
1192
1196
1204
1208
1212
1220
1224
1228
1236
1244
1252
1256
1260
1276
1296
1300
1304
1308
1320
1324
1328
1332
1340
1352
1358
1364
1372
1374
1378
1388
1392
1400
1401
1405
1410
1411
1413
1417
1418
1424
1430
1433
1434
Loading

0 comments on commit 8e0ca13

Please sign in to comment.