Merge branch 'dev'

# Conflicts: # public/index.html # public/js/custom.js # public/js/main.js
Jollus174 · Jul 30, 2017 · 6bb5de6 · 6bb5de6
2 parents a5049c8 + 4bad22a
commit 6bb5de6
Show file tree

Hide file tree

Showing 13 changed files with 830 additions and 704 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ Screenshot_2017-07-26-14-21-44.jpg
 Screenshot_2017-07-26-14-21-53.jpg
 sw-precache-config.js
 precache-line.txt
+127.0.0.1_2017-07-29_14-36-18.html
diff --git a/public/api/data.json b/public/api/data.json
@@ -25,7 +25,6 @@
     "imagePosition": "rightImage"
 }, {
     "name": "Bowser Jr.",
-    "className": "bowserjr",
     "url": "bowser-jr",
     "weight": "108",
     "bgColour": "#cfce37",
@@ -36,10 +35,10 @@
     "airdodgeStart": "3",
     "airdodgeEnd": "28",
     "imagePosition": "leftImage",
-    "textContrast": "text-dark"
+    "textContrast": "text-dark",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Captain Falcon",
-    "className": "cfalcon",
     "url": "captain-falcon",
     "weight": "104",
     "bgColour": "#9088e2",
@@ -52,7 +51,6 @@
     "imagePosition": "rightImage"
 }, {
     "name": "Charizard",
-    "className": "charizard",
     "url": "charizard",
     "weight": "116",
     "bgColour": "#f66624",
@@ -61,10 +59,10 @@
     "fallspeed": "1.4",
     "gravity": "0.11",
     "airdodgeStart": "3",
-    "airdodgeEnd": "28"
+    "airdodgeEnd": "28",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Cloud",
-    "className": "cloud",
     "url": "cloud",
     "weight": "100",
     "bgColour": "#009684",
@@ -76,7 +74,6 @@
     "airdodgeEnd": "28"
 }, {
     "name": "Cloud - Limit",
-    "className": "cloudlimit",
     "url": "cloud-limit",
     "weight": "100",
     "bgColour": "#009684",
@@ -88,7 +85,6 @@
     "airdodgeEnd": "28"
 }, {
     "name": "Corrin",
-    "className": "corrin",
     "url": "corrin",
     "weight": "98",
     "bgColour": "#733131",
@@ -135,7 +131,8 @@
     "airdodgeStart": "4",
     "airdodgeEnd": "29",
     "imagePosition": "rightImage",
-    "textContrast": "text-dark"
+    "textContrast": "text-dark",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Dr. Mario",
     "url": "dr-mario",
@@ -146,7 +143,8 @@
     "fallspeed": "1.5",
     "gravity": "0.08715",
     "airdodgeStart": "3",
-    "airdodgeEnd": "27"
+    "airdodgeEnd": "27",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Duck Hunt",
     "url": "duck-hunt",
@@ -157,7 +155,8 @@
     "fallspeed": "1.65",
     "gravity": "0.076",
     "airdodgeStart": "2",
-    "airdodgeEnd": "25"
+    "airdodgeEnd": "25",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Falco",
     "url": "falco",
@@ -169,7 +168,8 @@
     "gravity": "0.13",
     "airdodgeStart": "2",
     "airdodgeEnd": "26",
-    "imagePosition": "rightImage"
+    "imagePosition": "rightImage",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Fox",
     "url": "fox",
@@ -226,7 +226,8 @@
     "fallspeed": "0.98",
     "gravity": "0.05309",
     "airdodgeStart": "4",
-    "airdodgeEnd": "29"
+    "airdodgeEnd": "29",
+    "ledgeFsmash": "yes"
 }, {
     "name": "King Dedede",
     "url": "king-dedede",
@@ -238,7 +239,8 @@
     "gravity": "0.08788",
     "airdodgeStart": "4",
     "airdodgeEnd": "29",
-    "textContrast": "text-dark"
+    "textContrast": "text-dark",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Kirby",
     "url": "kirby",
@@ -284,7 +286,8 @@
     "gravity": "0.084",
     "airdodgeStart": "2",
     "airdodgeEnd": "25",
-    "textContrast": "text-dark"
+    "textContrast": "text-dark",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Lucas",
     "url": "lucas",
@@ -295,7 +298,8 @@
     "fallspeed": "1.37",
     "gravity": "0.09",
     "airdodgeStart": "3",
-    "airdodgeEnd": "28"
+    "airdodgeEnd": "28",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Lucina",
     "url": "lucina",
@@ -317,7 +321,8 @@
     "fallspeed": "1.25",
     "gravity": "0.075",
     "airdodgeStart": "3",
-    "airdodgeEnd": "27"
+    "airdodgeEnd": "27",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Mario",
     "url": "mario",
@@ -328,7 +333,8 @@
     "fallspeed": "1.5",
     "gravity": "0.08715",
     "airdodgeStart": "3",
-    "airdodgeEnd": "27"
+    "airdodgeEnd": "27",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Marth",
     "url": "marth",
@@ -361,7 +367,8 @@
     "fallspeed": "1.66",
     "gravity": "0.11",
     "airdodgeStart": "2",
-    "airdodgeEnd": "25"
+    "airdodgeEnd": "25",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Mewtwo",
     "url": "mewtwo",
@@ -373,7 +380,8 @@
     "gravity": "0.082",
     "airdodgeStart": "2",
     "airdodgeEnd": "24",
-    "imagePosition": "leftImage"
+    "imagePosition": "leftImage",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Mii Brawler",
     "url": "mii-brawler",
@@ -384,7 +392,8 @@
     "fallspeed": "1.7",
     "gravity": "0.1",
     "airdodgeStart": "3",
-    "airdodgeEnd": "27"
+    "airdodgeEnd": "27",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Mii Gunner",
     "url": "mii-gunner",
@@ -395,7 +404,8 @@
     "fallspeed": "1.7",
     "gravity": "0.08715",
     "airdodgeStart": "3",
-    "airdodgeEnd": "27"
+    "airdodgeEnd": "27",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Mii Swordfighter",
     "url": "mii-swordfighter",
@@ -406,7 +416,8 @@
     "fallspeed": "1.7",
     "gravity": "0.096",
     "airdodgeStart": "3",
-    "airdodgeEnd": "28"
+    "airdodgeEnd": "28",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Mr. Game and Watch",
     "url": "game-and-watch",
@@ -417,7 +428,8 @@
     "fallspeed": "1.24",
     "gravity": "0.08",
     "airdodgeStart": "2",
-    "airdodgeEnd": "26"
+    "airdodgeEnd": "26",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Ness",
     "url": "ness",
@@ -428,7 +440,8 @@
     "fallspeed": "1.31",
     "gravity": "0.077",
     "airdodgeStart": "3",
-    "airdodgeEnd": "28"
+    "airdodgeEnd": "28",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Olimar",
     "url": "olimar",
@@ -440,7 +453,8 @@
     "gravity": "0.068",
     "airdodgeStart": "3",
     "airdodgeEnd": "27",
-    "textContrast": "text-dark"
+    "textContrast": "text-dark",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Pac-Man",
     "url": "pacman",
@@ -486,7 +500,8 @@
     "fallspeed": "1.55",
     "gravity": "0.095",
     "airdodgeStart": "2",
-    "airdodgeEnd": "25"
+    "airdodgeEnd": "25",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Pit",
     "url": "pit",
@@ -509,7 +524,8 @@
     "fallspeed": "1.6",
     "gravity": "0.09",
     "airdodgeStart": "3",
-    "airdodgeEnd": "27"
+    "airdodgeEnd": "27",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Robin",
     "url": "robin",
@@ -555,7 +571,8 @@
     "fallspeed": "1.6",
     "gravity": "0.12",
     "airdodgeStart": "4",
-    "airdodgeEnd": "25"
+    "airdodgeEnd": "25",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Samus",
     "url": "samus",
@@ -671,7 +688,8 @@
     "fallspeed": "1.32",
     "gravity": "0.078",
     "airdodgeStart": "3",
-    "airdodgeEnd": "28"
+    "airdodgeEnd": "28",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Wario",
     "url": "wario",
@@ -706,7 +724,8 @@
     "fallspeed": "1.29",
     "gravity": "0.08",
     "airdodgeStart": "3",
-    "airdodgeEnd": "28"
+    "airdodgeEnd": "28",
+    "ledgeFsmash": "yes"
 }, {
     "name": "Zelda",
     "url": "zelda",