diff options
38 files changed, 1552 insertions, 132 deletions
@@ -6,14 +6,14 @@ <attribute name="module" value="true"/> </attributes> </classpathentry> - <classpathentry kind="lib" path="lib/windows/lib/javafx.base.jar"/> - <classpathentry kind="lib" path="lib/windows/lib/javafx.controls.jar"/> - <classpathentry kind="lib" path="lib/windows/lib/javafx.fxml.jar"/> - <classpathentry kind="lib" path="lib/windows/lib/javafx.graphics.jar"/> - <classpathentry kind="lib" path="lib/windows/lib/javafx.media.jar"/> - <classpathentry kind="lib" path="lib/windows/lib/javafx.swing.jar"/> - <classpathentry kind="lib" path="lib/windows/lib/javafx.web.jar"/> - <classpathentry kind="lib" path="lib/windows/lib/javafx-swt.jar"/> + <classpathentry kind="lib" path="lib/linux/javafx.base.jar"/> + <classpathentry kind="lib" path="lib/linux/javafx.controls.jar"/> + <classpathentry kind="lib" path="lib/linux/javafx.fxml.jar"/> + <classpathentry kind="lib" path="lib/linux/javafx.graphics.jar"/> + <classpathentry kind="lib" path="lib/linux/javafx.media.jar"/> + <classpathentry kind="lib" path="lib/linux/javafx.swing.jar"/> + <classpathentry kind="lib" path="lib/linux/javafx.web.jar"/> + <classpathentry kind="lib" path="lib/linux/javafx-swt.jar"/> <classpathentry kind="lib" path="lib/json-simple-1.1.1.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/levels/testLevel/hard/leaderboard.json b/levels/fragmentsOfTime/Medium/leaderboard.json index 0637a08..0637a08 100644 --- a/levels/testLevel/hard/leaderboard.json +++ b/levels/fragmentsOfTime/Medium/leaderboard.json diff --git a/levels/fragmentsOfTime/Medium/metadata.json b/levels/fragmentsOfTime/Medium/metadata.json new file mode 100644 index 0000000..086cb1f --- /dev/null +++ b/levels/fragmentsOfTime/Medium/metadata.json @@ -0,0 +1 @@ +{"numBeats":460,"title":"Medium","priority":2,"bpm":100.0}
\ No newline at end of file diff --git a/levels/fragmentsOfTime/Medium/notes.txt b/levels/fragmentsOfTime/Medium/notes.txt new file mode 100644 index 0000000..676e7bb --- /dev/null +++ b/levels/fragmentsOfTime/Medium/notes.txt @@ -0,0 +1,929 @@ +k1.5 +k2.5 +j2.9 +k3.5 +j4.4 +k5.1 +j5.5 +k5.9 +j6.2 +k8.6 +j8.9 +k9.7 +j10.5 +d11.4 +f11.8 +d12.1 +f12.5 +d12.9 +f13.2 +d13.6 +f13.9 +k14.9 +j15.9 +k16.6 +j17.3 +k17.7 +j18.1 +k18.4 +k20.1 +j20.9 +k21.3 +j22.1 +k22.6 +d23.4 +f23.8 +d24.2 +f24.6 +d25.0 +f25.3 +d25.7 +f26.1 +k27.0 +j27.4 +k28.2 +j29.6 +k30.0 +j30.4 +k30.7 +k33.1 +j33.5 +k34.2 +j35.0 +d35.7 +f36.1 +d36.6 +f36.9 +d37.4 +f37.7 +d38.1 +f38.4 +k39.4 +j40.7 +k41.2 +j41.9 +k42.3 +j42.6 +k43.0 +k44.7 +k45.5 +j45.8 +k46.6 +j47.3 +k48.1 +d49.0 +f49.3 +d49.7 +f50.0 +d50.4 +f50.7 +k51.5 +j51.9 +d52.7 +f53.5 +k54.4 +j54.8 +k57.7 +j58.0 +s59.1 +f59.7 +d60.1 +f60.5 +s60.8 +j61.1 +k61.4 +k63.8 +j64.2 +s64.5 +f65.1 +d65.7 +f66.1 +s66.5 +j66.8 +k67.1 +k68.1 +j68.6 +s68.9 +f69.4 +d70.0 +f70.7 +j72.7 +f72.7 +j73.1 +f73.1 +j73.5 +f73.5 +j73.9 +f73.9 +j74.3 +f74.3 +j74.6 +f74.7 +j75.0 +f75.1 +j75.4 +f75.4 +k76.2 +j76.5 +s77.0 +f77.4 +d77.8 +f78.3 +s78.5 +j78.8 +k79.2 +k82.2 +j82.5 +s83.0 +f83.3 +d84.1 +f84.5 +s84.8 +j85.1 +k85.5 +d88.3 +k88.3 +d88.7 +k88.7 +f89.7 +s90.5 +j91.2 +d91.6 +k91.6 +j92.1 +f92.1 +j94.0 +f94.0 +f94.6 +j94.6 +k95.1 +d95.1 +s95.8 +k100.1 +j100.9 +s101.2 +f101.6 +d101.9 +f102.3 +s102.6 +j103.1 +k103.4 +j104.3 +k105.2 +j105.5 +j105.9 +s106.2 +f106.9 +d107.3 +f107.6 +s107.9 +j108.2 +k108.7 +j109.0 +f109.8 +f110.7 +k111.3 +d111.6 +j111.8 +f112.2 +j113.8 +f113.9 +f114.2 +j114.2 +k114.9 +d115.0 +j116.1 +k116.6 +j117.2 +f117.7 +d118.0 +f118.4 +k119.3 +j119.6 +d120.3 +k120.3 +j121.1 +f121.1 +s121.9 +k122.7 +d122.8 +j123.4 +f123.4 +d123.8 +k123.9 +j124.2 +f124.2 +d124.6 +k124.6 +k125.4 +j125.8 +k126.1 +j126.5 +k127.0 +d127.4 +f127.9 +d128.9 +k129.6 +j129.9 +f130.3 +s130.7 +d131.6 +f132.0 +j132.3 +k132.7 +j133.0 +s133.5 +d134.2 +f134.6 +f135.2 +j135.7 +j136.1 +k136.5 +j136.9 +k137.8 +j138.1 +d138.7 +f139.6 +j140.3 +k140.7 +j141.1 +j141.9 +j142.2 +d142.6 +f143.1 +f143.9 +f144.4 +d144.9 +f145.6 +f146.6 +f146.9 +j147.2 +k147.5 +j148.0 +j148.9 +j149.4 +s150.3 +k151.1 +s151.8 +k152.9 +s153.5 +k153.8 +k154.5 +s154.9 +k155.2 +k156.1 +s156.4 +k157.2 +s158.0 +k158.7 +j159.1 +s159.7 +f160.1 +d160.4 +f160.8 +s161.1 +j161.4 +k161.7 +k162.4 +j162.9 +k163.5 +s164.2 +j165.0 +j165.5 +k165.8 +j166.1 +j166.7 +k167.1 +j167.5 +j168.4 +k168.8 +j169.5 +k170.3 +d171.1 +f171.4 +d171.9 +f172.3 +d172.6 +f172.9 +d173.3 +f173.7 +k174.6 +j174.9 +s175.6 +d176.4 +f176.8 +j177.2 +k177.6 +j178.0 +k180.6 +j181.0 +s181.3 +f181.7 +d182.5 +f182.9 +s183.3 +j183.7 +k184.0 +k186.9 +j187.1 +s188.0 +f189.0 +f189.7 +d190.1 +f190.5 +s191.7 +j192.1 +k193.0 +j193.7 +k195.6 +j195.9 +s196.3 +f196.7 +d197.1 +f197.6 +s198.0 +j198.3 +k199.7 +j200.0 +s201.1 +k201.9 +j202.6 +k205.2 +j205.6 +k206.0 +j206.3 +j207.3 +k207.6 +j208.0 +k208.3 +j208.6 +d211.5 +f211.9 +d212.3 +f212.6 +k213.4 +j213.7 +s214.1 +f214.7 +d215.0 +d216.0 +f216.5 +j216.6 +j217.4 +f217.4 +j218.0 +f218.0 +k218.7 +d218.7 +k223.1 +k223.8 +s224.2 +k224.7 +k225.1 +k225.4 +s225.8 +k226.2 +k226.5 +k226.9 +d227.3 +d228.0 +s228.8 +d229.2 +d230.0 +s230.3 +s230.8 +d231.4 +d232.6 +d233.3 +f234.2 +f234.5 +j234.9 +k235.3 +s236.1 +j236.4 +f237.2 +d238.0 +f238.7 +j239.4 +k240.1 +j240.4 +f240.8 +d241.2 +d242.2 +f242.5 +j243.3 +k244.1 +j244.8 +f245.6 +d246.4 +f246.8 +f247.2 +s247.6 +j248.7 +k249.1 +j249.5 +s250.0 +f250.4 +d250.8 +f251.1 +s251.8 +j252.5 +k252.8 +j253.1 +s253.6 +f253.9 +d254.5 +f254.9 +s255.2 +j255.4 +k255.8 +j256.1 +s256.6 +f257.3 +d257.7 +f258.1 +j258.8 +j259.2 +j259.6 +j259.9 +d260.7 +k260.7 +k261.0 +d261.1 +k261.4 +d261.4 +d262.1 +k262.1 +j262.7 +f262.7 +k263.4 +d263.4 +k263.7 +d263.7 +j264.1 +f264.2 +k264.9 +d264.9 +k265.2 +d265.2 +j265.6 +f265.7 +k266.0 +d266.0 +d266.7 +k266.9 +j267.2 +f267.2 +k267.9 +d267.9 +j268.8 +f268.8 +k269.5 +j269.8 +s270.2 +f270.5 +d270.8 +f271.2 +s271.5 +j271.8 +k272.2 +k272.9 +j273.3 +k274.1 +j275.0 +k275.6 +j276.3 +k277.1 +k277.4 +j277.8 +k278.2 +k279.1 +j279.4 +k280.3 +j281.1 +k281.8 +j282.6 +k283.3 +k283.6 +j284.1 +k284.3 +k285.3 +j285.7 +k286.4 +j287.2 +k288.0 +k288.3 +j288.7 +k289.0 +k289.8 +j290.1 +k290.4 +k291.4 +j291.8 +k292.6 +j293.4 +k294.1 +k294.5 +j294.9 +k295.2 +k295.9 +d296.5 +k296.9 +k297.7 +d298.1 +k298.2 +k298.5 +k298.9 +k299.2 +d299.5 +k299.6 +k300.3 +k300.7 +k301.1 +d301.1 +k301.4 +k301.8 +k302.0 +d302.4 +k302.5 +k302.9 +k303.2 +k303.6 +d304.1 +k304.1 +k304.5 +k304.9 +k305.2 +d305.5 +k305.7 +k306.0 +k306.3 +j306.7 +j307.2 +j307.9 +j308.3 +j308.6 +k309.5 +d309.6 +k310.2 +d310.3 +k311.0 +d311.1 +k311.8 +d311.9 +k312.6 +d312.6 +k313.4 +d313.4 +k314.2 +d314.3 +k314.8 +d314.9 +k315.6 +d315.7 +k316.3 +d316.4 +k317.1 +d317.2 +k317.9 +d318.0 +k318.6 +k319.0 +j319.4 +k319.8 +j320.6 +s320.9 +f321.3 +d321.5 +d322.4 +d323.4 +d324.2 +d324.9 +d325.3 +d325.7 +d326.0 +d326.4 +d326.8 +d327.2 +f327.6 +s328.5 +j329.2 +k330.0 +j330.9 +s331.2 +f331.7 +d332.0 +f332.5 +f332.8 +f333.7 +f334.8 +j335.1 +k335.4 +j335.6 +s336.1 +f336.9 +d337.3 +f337.7 +s338.1 +j338.4 +k338.7 +j339.0 +s339.4 +f339.8 +f340.8 +f341.8 +k343.1 +j343.3 +k343.9 +j344.1 +k344.5 +j344.6 +k345.0 +j345.2 +k345.5 +j345.6 +f346.2 +f347.2 +f348.3 +d348.8 +d350.1 +f350.6 +s351.1 +j351.4 +k351.7 +j352.1 +k353.3 +j353.5 +k354.6 +j354.9 +k355.6 +j355.9 +k357.0 +k357.5 +j358.3 +k358.3 +f358.4 +d358.4 +k359.4 +j359.4 +d359.5 +f359.5 +k360.3 +j360.3 +d360.3 +f360.3 +k361.0 +d361.0 +f361.0 +j361.0 +d361.8 +k361.8 +d362.4 +f362.5 +k362.5 +j362.5 +k363.3 +d363.3 +k363.6 +d363.6 +j364.5 +f364.5 +k365.4 +d365.5 +j365.8 +f365.8 +k366.4 +j366.4 +f366.5 +d366.5 +k367.2 +j367.2 +d367.2 +f367.2 +k367.9 +d367.9 +f367.9 +d368.5 +f368.5 +k368.5 +j368.6 +k369.0 +j369.3 +s369.7 +f370.0 +d370.4 +k371.4 +j371.7 +k372.2 +j372.6 +d373.1 +f373.5 +f373.9 +f374.9 +f375.5 +d375.9 +f376.3 +k376.8 +k377.5 +j377.7 +s378.4 +j378.7 +k379.2 +j379.5 +f380.2 +d380.6 +d381.1 +f381.8 +f382.1 +s382.4 +j382.6 +k382.9 +k383.6 +j384.1 +s384.8 +f385.5 +d386.3 +f386.7 +j387.0 +k387.8 +k388.2 +j389.0 +f389.8 +j389.8 +f390.1 +j390.2 +f390.5 +j390.5 +f390.9 +j390.9 +k391.7 +d391.7 +f392.5 +j392.6 +k393.3 +j393.6 +s394.1 +f394.4 +d394.8 +f395.1 +s396.0 +j396.4 +k396.7 +k397.8 +j398.1 +s398.5 +f398.8 +d399.1 +f399.5 +j399.8 +k400.1 +s400.6 +j400.9 +k402.6 +k403.0 +k403.4 +k403.7 +d404.0 +k404.1 +k404.6 +k404.9 +k405.2 +d405.7 +k405.8 +k406.1 +k406.5 +k406.8 +j407.2 +j407.6 +j408.7 +f408.8 +j409.1 +f409.1 +k410.1 +d410.1 +j411.0 +f411.0 +k411.9 +k412.6 +k412.9 +j413.2 +d414.6 +f415.0 +j415.6 +k416.3 +j417.1 +j417.5 +d418.0 +f418.6 +f419.0 +f419.4 +k420.6 +j421.0 +k421.4 +k421.8 +k422.1 +d422.5 +k422.6 +k423.0 +k423.6 +d424.0 +k424.1 +k424.6 +k424.9 +d425.6 +k425.6 +j427.2 +j428.8 +f428.8 +j429.1 +j429.4 +j429.7 +f430.2 +j430.3 +j430.6 +j430.9 +j431.3 +k431.8 +d431.8 +k432.2 +k432.4 +k432.8 +d433.4 +k433.4 +k433.7 +k434.0 +k434.4 +d434.8 +k434.9 +k435.3 +k435.7 +j436.4 +f436.4 +j436.9 +j437.3 +j437.6 +f437.9 +j438.0 +j438.3 +j438.8 +j439.1 +f439.4 +j439.6 +j440.0 +j440.4 +f440.9 +j440.9 +j441.3 +j441.7 +k442.5 +d442.5 +k442.9 +k443.3 +d443.3 +k443.6 +d443.7 +k443.9 +d444.1 +k444.3 +d444.4 +d445.1 +k445.5 +d445.6 +k446.0 +k446.4 +d447.1 +k447.1 +k447.4 +k447.7 +k448.1 +d448.7 +k448.7 +k449.1 +d449.3 +k449.4 +d449.6 +k449.7 +d450.1 +k450.2 +k450.5 +d450.5 +k451.3 +k451.6 +d452.0 +k452.1 +k452.5 +k452.8 +d452.9 +k453.3 +d453.4 +k454.1 +k454.4 +k454.8 +k455.6 +d455.6 +d455.9 +k455.9 +d456.3 +k456.3 +d456.6 +k456.7 diff --git a/levels/fragmentsOfTime/background.png b/levels/fragmentsOfTime/background.png Binary files differnew file mode 100644 index 0000000..de6d35d --- /dev/null +++ b/levels/fragmentsOfTime/background.png diff --git a/levels/fragmentsOfTime/metadata.json b/levels/fragmentsOfTime/metadata.json new file mode 100644 index 0000000..fcdd51d --- /dev/null +++ b/levels/fragmentsOfTime/metadata.json @@ -0,0 +1 @@ +{"color1":"0xcccc33ff","color2":"0xffffffff","artist":"Daft Punk","title":"Fragments Of Time","color5":"0xcccc33ff","color3":"0xb3ccffff","desc":"(feat. Todd Edwards)","color4":"0xffffffff"}
\ No newline at end of file diff --git a/levels/fragmentsOfTime/preview.png b/levels/fragmentsOfTime/preview.png Binary files differnew file mode 100644 index 0000000..849215a --- /dev/null +++ b/levels/fragmentsOfTime/preview.png diff --git a/levels/intoMyArms/Medium/metadata.json b/levels/intoMyArms/Medium/metadata.json index b116d97..a570f3b 100644 --- a/levels/intoMyArms/Medium/metadata.json +++ b/levels/intoMyArms/Medium/metadata.json @@ -1 +1 @@ -{"numBeats":0,"title":"Medium","priority":2,"bpm":175.0}
\ No newline at end of file +{"numBeats":670,"title":"Medium","priority":2,"bpm":175.0}
\ No newline at end of file diff --git a/levels/intoMyArms/Medium/notes.txt b/levels/intoMyArms/Medium/notes.txt index e69de29..79c60b1 100644 --- a/levels/intoMyArms/Medium/notes.txt +++ b/levels/intoMyArms/Medium/notes.txt @@ -0,0 +1,606 @@ +k10.2 +d10.8 +k11.7 +d12.7 +k13.8 +d14.7 +k15.8 +d16.9 +k17.9 +d18.9 +k19.9 +d20.8 +k21.9 +d22.8 +k23.9 +d24.9 +k25.9 +d26.8 +k27.9 +d28.9 +k30.0 +d30.8 +k31.8 +d32.8 +k33.8 +d34.7 +k35.7 +d36.8 +k37.8 +d38.8 +k39.8 +d40.7 +k41.9 +j42.4 +s43.3 +f43.8 +d44.3 +d48.3 +f48.8 +s49.4 +j50.1 +k50.7 +d57.0 +k57.0 +d57.9 +k58.0 +f59.0 +j59.0 +s59.6 +d60.5 +k60.5 +k66.0 +j66.4 +f66.9 +d67.4 +s68.0 +j68.4 +k68.9 +k73.5 +j74.0 +d75.2 +f75.8 +k81.2 +j82.1 +f83.0 +d88.5 +f89.2 +j90.0 +k90.8 +j91.6 +s97.5 +s98.7 +d105.5 +k105.5 +d107.0 +k107.0 +d108.4 +k108.5 +f110.6 +j110.6 +f111.4 +j111.4 +k113.8 +d113.8 +d115.1 +k115.2 +d116.5 +k116.6 +j118.4 +f118.4 +k121.8 +j122.5 +s123.5 +f124.5 +d126.3 +d128.2 +d129.1 +d130.1 +d131.1 +d132.0 +d132.9 +d133.8 +d136.8 +f137.6 +s138.0 +j138.4 +k139.0 +j139.7 +s140.4 +f141.0 +d141.6 +d142.8 +f143.4 +s144.1 +j144.6 +k145.2 +j145.7 +s146.4 +f146.9 +d147.4 +k153.2 +k154.2 +k154.7 +k155.7 +k156.6 +k157.5 +k158.6 +j159.4 +k160.5 +k169.2 +j169.9 +s170.4 +d171.0 +f171.7 +s172.2 +j172.6 +k173.3 +j174.0 +s174.5 +f175.1 +d175.5 +d176.9 +f177.3 +s178.1 +j178.4 +k179.1 +j179.7 +s180.8 +d181.5 +f182.5 +k185.2 +j185.8 +s186.4 +d187.4 +f188.3 +k189.4 +j190.1 +f191.1 +d191.9 +k194.1 +j194.7 +s195.5 +f196.4 +d197.3 +f198.1 +j199.0 +k199.9 +j201.1 +s201.8 +f202.8 +d203.6 +f204.5 +s205.2 +j205.8 +k206.6 +j207.2 +s207.9 +f208.8 +d209.7 +f210.6 +j211.5 +k212.8 +j213.9 +d215.4 +f216.5 +j217.5 +k218.4 +j219.2 +f220.2 +d221.1 +f222.3 +k223.3 +j224.4 +s225.3 +k226.2 +j227.3 +k233.5 +f234.5 +k235.6 +f236.6 +k237.6 +f238.6 +k239.7 +f240.7 +k241.7 +f242.6 +k243.6 +f244.5 +k245.6 +f246.6 +k247.5 +f248.5 +j249.4 +d250.5 +j251.5 +d252.6 +j253.6 +d254.7 +j255.7 +d256.7 +k258.2 +d258.3 +k258.9 +d259.0 +k259.5 +d259.5 +d260.0 +k260.0 +j260.8 +f260.8 +k261.4 +d261.4 +j261.9 +f261.9 +k262.4 +d262.4 +k265.7 +j266.4 +k266.9 +d267.6 +f268.2 +k272.9 +d273.2 +j273.8 +f274.3 +s274.8 +k275.3 +d275.8 +j281.4 +k282.0 +f282.9 +d283.5 +f284.3 +k290.4 +j290.9 +f291.5 +k292.1 +d292.6 +k297.7 +k299.0 +k301.0 +j302.4 +k303.4 +j306.6 +j307.8 +j308.9 +f310.5 +f312.7 +f313.6 +f314.7 +f315.8 +d316.9 +f318.7 +f320.7 +f321.7 +f322.7 +f323.8 +f324.9 +f325.8 +f326.6 +f327.8 +f328.6 +j329.8 +k330.4 +j330.9 +f331.5 +d332.1 +f332.8 +j333.6 +k334.2 +j334.8 +f335.7 +d336.3 +s337.4 +j338.0 +k338.6 +j339.3 +f339.9 +d340.5 +f341.1 +s341.9 +j342.6 +k343.1 +j343.9 +s344.9 +f345.7 +d346.2 +f347.2 +k348.3 +j349.2 +k350.5 +j351.2 +d352.2 +f353.1 +j353.8 +f354.8 +k355.7 +d356.6 +f357.7 +j358.6 +k361.2 +s361.9 +f362.4 +d362.9 +f363.6 +s364.1 +j364.5 +k365.0 +j365.6 +s366.2 +f366.6 +d367.1 +f368.1 +j368.6 +k369.6 +s369.6 +j370.5 +k376.8 +j377.8 +f378.5 +d379.4 +f380.4 +j381.2 +k382.1 +j383.2 +s384.1 +j384.9 +f386.5 +d387.2 +f388.1 +j388.9 +k389.7 +j390.7 +k393.4 +j393.9 +s394.4 +f394.7 +d396.1 +k397.4 +f398.7 +k399.6 +f400.7 +k401.7 +f402.6 +k403.6 +f404.6 +k405.7 +f406.6 +k407.7 +f408.6 +j409.6 +d410.7 +j411.8 +d412.9 +j413.8 +d414.8 +j415.7 +d416.6 +j417.7 +d418.6 +j419.6 +d420.5 +j421.6 +d422.5 +j423.6 +d424.4 +k425.6 +f426.6 +k427.6 +f428.6 +k429.6 +f430.5 +k431.5 +f432.5 +k433.5 +f434.5 +k435.5 +f436.6 +k437.5 +f438.6 +k439.5 +f440.5 +j441.6 +d442.5 +j443.6 +d444.3 +j445.6 +d446.6 +j447.6 +d448.5 +j449.6 +d450.5 +j451.6 +d452.5 +j453.7 +d454.7 +j455.7 +d456.6 +k457.6 +f458.6 +k459.8 +f460.6 +k461.6 +f462.5 +k463.6 +f464.6 +k465.5 +f466.4 +k467.5 +f468.4 +k469.4 +f470.3 +k471.5 +f472.3 +k473.4 +f474.5 +k475.5 +f476.4 +k477.5 +f478.3 +k479.4 +f480.5 +k481.5 +f482.3 +k483.4 +f484.3 +k485.3 +f486.2 +k487.4 +f488.0 +j489.3 +d490.4 +j491.4 +d492.5 +j493.5 +d494.4 +j495.5 +d496.3 +j497.5 +d498.3 +j499.3 +d500.2 +j501.4 +d502.2 +j503.3 +d504.1 +j505.2 +d506.3 +j507.2 +d508.1 +j509.1 +d509.9 +j511.0 +d511.8 +j513.0 +d513.8 +j514.8 +d515.4 +j516.5 +d517.3 +j518.3 +d519.0 +j520.2 +d521.0 +j522.0 +d522.7 +j524.0 +d524.9 +j525.8 +d526.6 +j527.3 +d529.3 +f529.8 +s530.4 +j530.9 +k531.6 +j532.3 +s532.9 +f533.4 +d534.2 +f534.8 +s535.2 +j535.9 +k536.4 +j537.0 +s537.8 +f538.2 +d538.9 +j545.0 +k546.0 +j546.5 +f547.5 +d548.3 +f549.4 +k551.3 +j552.0 +d560.7 +f561.3 +s561.6 +j562.0 +k562.5 +s563.3 +f563.9 +d564.5 +f565.4 +s565.9 +j566.4 +k566.9 +j567.6 +s568.4 +f569.1 +d569.6 +k576.8 +j577.8 +f578.5 +d579.4 +f580.4 +j581.4 +k582.4 +j583.3 +f584.3 +k589.5 +j590.3 +f591.9 +d593.4 +f594.1 +s594.6 +j595.0 +k595.6 +j596.1 +s596.5 +f597.1 +d597.8 +f598.9 +s599.7 +j600.2 +k600.8 +j601.5 +s602.0 +f602.5 +d603.1 +d608.8 +f609.4 +s609.8 +j610.2 +k610.8 +j611.4 +s611.8 +f612.3 +d613.0 +f613.9 +s614.5 +j614.9 +k615.5 +j616.2 +s616.8 +f617.2 +d617.7 +d618.8 +f619.3 +k625.5 +k626.9 +j631.1 +k632.8 +d641.4 +f642.3 +j643.4 +k644.2 +j645.2 +s646.8 +f648.3 +d649.5 +f650.5 +j651.4 +k652.5 +j653.4 +f654.5 +d655.5 +f656.5 +k657.4 +k660.1 +k662.0 +k664.0 +k666.0 +k668.0 +k670.0 diff --git a/levels/testLevel/background.png b/levels/testLevel/background.png Binary files differdeleted file mode 100644 index e2afd1b..0000000 --- a/levels/testLevel/background.png +++ /dev/null diff --git a/levels/testLevel/easy/leaderboard.json b/levels/testLevel/easy/leaderboard.json deleted file mode 100644 index 7c2b5bc..0000000 --- a/levels/testLevel/easy/leaderboard.json +++ /dev/null @@ -1 +0,0 @@ -[{"date":"today","score":100,"name":"tbone"},{"date":"today","score":0,"name":"zbone"},{"date":"2023-05-30","score":0,"name":"greg"},{"date":"2023-06-04","score":39600,"name":"the GOOOOATT"}]
\ No newline at end of file diff --git a/levels/testLevel/easy/metadata.json b/levels/testLevel/easy/metadata.json deleted file mode 100644 index d7f94d6..0000000 --- a/levels/testLevel/easy/metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"numBeats":28,"title":"Easy","priority":1,"bpm":120.0}
\ No newline at end of file diff --git a/levels/testLevel/easy/notes.txt b/levels/testLevel/easy/notes.txt deleted file mode 100644 index db5fa66..0000000 --- a/levels/testLevel/easy/notes.txt +++ /dev/null @@ -1,26 +0,0 @@ -d0.00 -d1.00 -d2.00 -f3.00 -s4.00 -j5.00 -k6.00 -j7.00 -f8.00 -d9.00 -f10.00 -s11.00 -j12.00 -k13.00 -j14.00 -s15.00 -f16.00 -d17.00 -f18.00 -s19.00 -j20.00 -k21.00 -j22.00 -s23.00 -f24.00 -d25.00 diff --git a/levels/testLevel/hard/metadata.json b/levels/testLevel/hard/metadata.json deleted file mode 100644 index ab1912f..0000000 --- a/levels/testLevel/hard/metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"numBeats":15,"title":"Hard","priority":3,"bpm":60.0}
\ No newline at end of file diff --git a/levels/testLevel/hard/notes.txt b/levels/testLevel/hard/notes.txt deleted file mode 100644 index 2e181de..0000000 --- a/levels/testLevel/hard/notes.txt +++ /dev/null @@ -1,33 +0,0 @@ -d4.000 -d4.333 -d4.666 -f5.000 -k5.500 -s6.000 -j6.000 -j6.250 -d6.500 -j6.750 -s7.000 -f7.500 -j7.750 -s8.000 -f8.500 -j8.500 -d9.000 -s9.000 -k9.000 -s9.500 -k10.000 -d10.000 -k10.333 -f10.333 -k10.666 -s10.666 -d11.000 -s11.000 -d11.333 -j11.333 -d11.666 -k11.666 -s12.000
\ No newline at end of file diff --git a/levels/testLevel/medium/leaderboard.json b/levels/testLevel/medium/leaderboard.json deleted file mode 100644 index 0637a08..0000000 --- a/levels/testLevel/medium/leaderboard.json +++ /dev/null @@ -1 +0,0 @@ -[]
\ No newline at end of file diff --git a/levels/testLevel/medium/metadata.json b/levels/testLevel/medium/metadata.json deleted file mode 100644 index fad4f36..0000000 --- a/levels/testLevel/medium/metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"numBeats":6,"title":"Medium","priority":2,"bpm":60.0}
\ No newline at end of file diff --git a/levels/testLevel/medium/notes.txt b/levels/testLevel/medium/notes.txt deleted file mode 100644 index 5b0d70a..0000000 --- a/levels/testLevel/medium/notes.txt +++ /dev/null @@ -1,5 +0,0 @@ -d4.00 -f5.00 -s6.00 -j7.00 -k8.00
\ No newline at end of file diff --git a/levels/testLevel/metadata.json b/levels/testLevel/metadata.json deleted file mode 100644 index b055416..0000000 --- a/levels/testLevel/metadata.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "title": "testSong", - "artist": "ed sheeran", - "desc": "this is a test level. lalalala testing testing", - - "color1": "#ffae00", - "color2": "#264630", - "color3": "#3b77d6", - "color4": "#f0bd07", - "color5": "#c2e7ff" - -}
\ No newline at end of file diff --git a/levels/testLevel/preview.png b/levels/testLevel/preview.png Binary files differdeleted file mode 100644 index 002ad9e..0000000 --- a/levels/testLevel/preview.png +++ /dev/null diff --git a/levels/testLevel2/background.png b/levels/testLevel2/background.png Binary files differdeleted file mode 100644 index e2afd1b..0000000 --- a/levels/testLevel2/background.png +++ /dev/null diff --git a/levels/testLevel2/easy/leaderboard.json b/levels/testLevel2/easy/leaderboard.json deleted file mode 100644 index e922f47..0000000 --- a/levels/testLevel2/easy/leaderboard.json +++ /dev/null @@ -1 +0,0 @@ -[{"date":"2023-06-02","score":17900,"name":"zbone"},{"date":"2023-06-05","score":47900,"name":"tBONE"}]
\ No newline at end of file diff --git a/levels/testLevel2/easy/metadata.json b/levels/testLevel2/easy/metadata.json deleted file mode 100644 index 1b68a6d..0000000 --- a/levels/testLevel2/easy/metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"numBeats":28,"title":"Easy","priority":1,"bpm":85.0}
\ No newline at end of file diff --git a/levels/testLevel2/easy/notes.txt b/levels/testLevel2/easy/notes.txt deleted file mode 100644 index 69e58d5..0000000 --- a/levels/testLevel2/easy/notes.txt +++ /dev/null @@ -1,26 +0,0 @@ -s0.00 -d1.00 -d2.00 -f3.00 -s4.00 -j5.00 -k6.00 -j7.00 -f8.00 -d9.00 -f10.00 -s11.00 -j12.00 -k13.00 -j14.00 -s15.00 -f16.00 -d17.00 -f18.00 -s19.00 -j20.00 -k21.00 -j22.00 -s23.00 -f24.00 -d25.00 diff --git a/levels/testLevel2/hard/leaderboard.json b/levels/testLevel2/hard/leaderboard.json deleted file mode 100644 index 0637a08..0000000 --- a/levels/testLevel2/hard/leaderboard.json +++ /dev/null @@ -1 +0,0 @@ -[]
\ No newline at end of file diff --git a/levels/testLevel2/hard/metadata.json b/levels/testLevel2/hard/metadata.json deleted file mode 100644 index 9a86e48..0000000 --- a/levels/testLevel2/hard/metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"numBeats":0,"title":"Hard","priority":3,"bpm":50.0}
\ No newline at end of file diff --git a/levels/testLevel2/hard/notes.txt b/levels/testLevel2/hard/notes.txt deleted file mode 100644 index e69de29..0000000 --- a/levels/testLevel2/hard/notes.txt +++ /dev/null diff --git a/levels/testLevel2/medium/leaderboard.json b/levels/testLevel2/medium/leaderboard.json deleted file mode 100644 index 0637a08..0000000 --- a/levels/testLevel2/medium/leaderboard.json +++ /dev/null @@ -1 +0,0 @@ -[]
\ No newline at end of file diff --git a/levels/testLevel2/medium/metadata.json b/levels/testLevel2/medium/metadata.json deleted file mode 100644 index 6f3d410..0000000 --- a/levels/testLevel2/medium/metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"numBeats":0,"title":"Medium","priority":2,"bpm":0.0}
\ No newline at end of file diff --git a/levels/testLevel2/medium/notes.txt b/levels/testLevel2/medium/notes.txt deleted file mode 100644 index e69de29..0000000 --- a/levels/testLevel2/medium/notes.txt +++ /dev/null diff --git a/levels/testLevel2/metadata.json b/levels/testLevel2/metadata.json deleted file mode 100644 index 4058afd..0000000 --- a/levels/testLevel2/metadata.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "title": "testSong2", - "artist": "fred shmeeran", - "desc": "testSong 2: electric boogaloo" -}
\ No newline at end of file diff --git a/levels/testLevel2/preview.png b/levels/testLevel2/preview.png Binary files differdeleted file mode 100644 index 002ad9e..0000000 --- a/levels/testLevel2/preview.png +++ /dev/null diff --git a/settings.json b/settings.json index 7b720ef..b7be92b 100644 --- a/settings.json +++ b/settings.json @@ -1 +1 @@ -{"musicVol":1.0,"effectsVol":0.2374999863760811}
\ No newline at end of file +{"musicVol":1.0,"effectsVol":1.0}
\ No newline at end of file diff --git a/src/gui/style.css b/src/assets/style.css index dd1de55..dd1de55 100644 --- a/src/gui/style.css +++ b/src/assets/style.css diff --git a/src/devmenu/LevelList.java b/src/devmenu/LevelList.java index 7087472..f9b4207 100644 --- a/src/devmenu/LevelList.java +++ b/src/devmenu/LevelList.java @@ -15,8 +15,6 @@ import main.LevelController; public class LevelList { - Stage primaryStage = new Stage(); - /* * this class is a layout class, most of its purpose is to place UI elements like Buttons within Panes like VBoxes. * the creation of these UI elements are mostly not commented due to their repetitive and self explanatory nature. @@ -65,7 +63,8 @@ public class LevelList VBox main = new VBox(); main.getChildren().addAll(levels,buttons,newLevelBox); - Scene scene = new Scene(main); + Scene scene = new Scene(main, 400, 400); + Stage primaryStage = new Stage(); primaryStage.setScene(scene); primaryStage.show(); } diff --git a/src/gui/Driver.java b/src/gui/Driver.java index fd18933..4f840e8 100644 --- a/src/gui/Driver.java +++ b/src/gui/Driver.java @@ -50,7 +50,7 @@ public class Driver extends Application primaryStage = newPrimaryStage; Scene primaryScene = new Scene(primaryPane, 800,600); - primaryScene.getStylesheets().add("gui/style.css"); + primaryScene.getStylesheets().add("assets/style.css"); primaryStage.setScene(primaryScene); primaryStage.setTitle("NPE Hero"); diff --git a/start_linux.sh b/start_linux.sh new file mode 100755 index 0000000..0cf6cdf --- /dev/null +++ b/start_linux.sh @@ -0,0 +1 @@ +java --module-path lib/linux --add-modules javafx.controls,javafx.fxml,javafx.media -Dprism.forceGPU=true -jar npehero_linux.jar
\ No newline at end of file diff --git a/start_windows.bat b/start_windows.bat new file mode 100644 index 0000000..f28f776 --- /dev/null +++ b/start_windows.bat @@ -0,0 +1 @@ +java --module-path lib/windows/lib --add-modules javafx.controls,javafx.fxml,javafx.media -jar npehero_windows.jar
\ No newline at end of file |
