Merge branch 'dev' into early-unstable

EmuDeck · Jun 13, 2024 · ffebcb1 · ffebcb1
2 parents 4dbeb71 + c3a48a0
commit ffebcb1
Show file tree

Hide file tree

Showing 37 changed files with 639 additions and 4,043 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/assets/deckyromlauncher.jpg b/src/assets/deckyromlauncher.jpg
diff --git a/src/assets/emulators/cemu.png b/src/assets/emulators/cemu.png
diff --git a/src/assets/emulators/citra.png b/src/assets/emulators/citra.png
diff --git a/src/assets/emulators/esde.png b/src/assets/emulators/esde.png
diff --git a/src/assets/emulators/pegasus.png b/src/assets/emulators/pegasus.png
diff --git a/src/assets/emulators/rpcs3.png b/src/assets/emulators/rpcs3.png
diff --git a/src/assets/emulators/ryujinx.png b/src/assets/emulators/ryujinx.png
diff --git a/src/assets/emulators/supermodel.png b/src/assets/emulators/supermodel.png
diff --git a/src/assets/emulators/vita3k.png b/src/assets/emulators/vita3k.png
diff --git a/src/assets/fonts/avenir-light-webfont.woff2 b/src/assets/fonts/avenir-light-webfont.woff2
diff --git a/src/assets/fonts/avenir-medium-webfont.woff2 b/src/assets/fonts/avenir-medium-webfont.woff2
diff --git a/src/assets/fonts/avenir-roman-webfont.woff2 b/src/assets/fonts/avenir-roman-webfont.woff2
diff --git a/src/assets/icon/custom.svg b/src/assets/icon/custom.svg
diff --git a/src/assets/icon/gear.svg b/src/assets/icon/gear.svg
diff --git a/src/assets/icon/package.svg b/src/assets/icon/package.svg
diff --git a/src/assets/icon/quick.svg b/src/assets/icon/quick.svg
diff --git a/src/assets/icon/update.svg b/src/assets/icon/update.svg
diff --git a/src/data/emuData.json b/src/data/emuData.json
@@ -7,7 +7,9 @@
     "description": "",
     "special_configuration": "Custom textures for the NES and N64 using EmuDeck's pre-created folder: Emulation/hdpacks",
     "bios": ["ps1", "segacd", "saturn", "nds", "dreamcast"],
-    "systems": "Retro Game Systems, including but not limited to, Nintendo 64, Saturn and Dreamcast",
+    "systems": [
+      "Retro Game Systems, including but not limited to, Nintendo 64, Saturn and Dreamcast"
+    ],
     "hotkeys": {
       "0": ["Action", "Keys"],
       "1": ["Menu", "L3+R3"],

diff --git a/src/global.scss b/src/global.scss
@@ -10,28 +10,28 @@
 @import './utils/animate/animate.scss';
 
 @font-face {
-  font-family: 'MotivaSans';
-  src: url('assets/fonts/Raleway-Thin.ttf');
+  font-family: 'Avenir';
+  src: url('assets/fonts/avenir-light-webfont.woff2');
   font-weight: 100;
 }
 @font-face {
-  font-family: 'MotivaSans';
-  src: url('assets/fonts/Raleway-Light.ttf');
+  font-family: 'Avenir';
+  src: url('assets/fonts/avenir-light-webfont.woff2');
   font-weight: 200;
 }
 @font-face {
-  font-family: 'MotivaSans';
-  src: url('assets/fonts/Raleway-Regular.ttf');
+  font-family: 'Avenir';
+  src: url('assets/fonts/avenir-light-webfont.woff2');
   font-weight: 300;
 }
 @font-face {
-  font-family: 'MotivaSans';
-  src: url('assets/fonts/Raleway-Medium.ttf');
+  font-family: 'Avenir';
+  src: url('assets/fonts/avenir-light-webfont.woff2');
   font-weight: 400;
 }
 @font-face {
-  font-family: 'MotivaSans';
-  src: url('assets/fonts/Raleway-Black.ttf');
+  font-family: 'Avenir';
+  src: url('assets/fonts/avenir-medium-webfont.woff2');
   font-weight: 600;
 }