Merge branch 'new-icons' into 'dev'

Copy changes made to `master` branch into `dev` See merge request suyu-emu/suyu!41
2024-11-15 22:54:00 +00:00 · 2024-03-06 15:55:33 +00:00 · 2024-03-06 15:55:33 +00:00 · b92e629884
commit b92e629884
parent 6df2ff2592 72fa5ff724
6 changed files with 84 additions and 15 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -3,4 +3,7 @@ SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 SPDX-License-Identifier: GPL-2.0-or-later
 -->

-**The Contributor's Guide has moved to [the suyu wiki](https://gitlab.com/suyu2/suyu/-/wikis/Contributing).**
+Please check out the
+
+ * [Conributors's guide](https://gitlab.com/suyu2/suyu/-/wikis/Contributing).
+ * [Merge request guidelines](https://gitlab.com/suyu-emu/suyu/-/wikis/Merge-requests)
--- a/README.md
+++ b/README.md
@ -3,39 +3,38 @@ SPDX-FileCopyrightText: 2024 suyu emulator project
 SPDX-License-Identifier: GPL v3
 -->

-<h4>This project DOES NOT support piracy, you are required to source your own games and keys, we make no money off this project (mainly so that Nintendo won't sue us lol)</h4>
+**Note**: We do not support or condone piracy in any form. In order to use Suyu, you'll need keys from your real Switch system, and games which you have legally obtained and paid for. We do not intend to make money or profit from this project.

+We are in great need of developers, join our Discord server at <a href="https://discord.gg/2gQRBp44KT">https://discord.gg/2gQRBp44KT</a>.

-We are in great need of developers, join our discord server at <a href="https://discord.gg/2gQRBp44KT">https://discord.gg/2gQRBp44KT</a>
+This repo is based on Yuzu EA 4176. Please contribute if you can!

-This repo is created based on yuzu EA 4176. Please contribute
+<hr />

-<h1 style="text-align:center;">
+<h1 align="center">
  <br>
-  <a href=""><img src="https://cdn.discordapp.com/attachments/1214441121099419718/1214452770334056488/Suyu-Logo_V2.png?ex=65f92a47&is=65e6b547&hm=a1f174d70a5c106fec6a998c603e1158d8f3011a6c9ff91415b7c02afe9c0262&" alt="suyu" width="200"></a>
+  <a href=""><img src="https://gitlab.com/suyu-emu/suyu/-/raw/master/dist/readme/suyu__Logo-Pill.svg" alt="suyu" height="128"></a>
  <br>
  <b>suyu</b>
  <br>
 </h1>

-<h4 align="center"><b>suyu</b>, pronounced "sue-you" is the afterlife the world's most popular, open-source, Nintendo Switch emulator — started by the creators of <a href="https://citra-emu.org" target="_blank">Citra</a>.
+<h4 align="center"><b>suyu</b>, pronounced "sue-you" (wink wink) is the continuation of the world's most popular, open-source, Nintendo Switch emulator, yuzu.
 <br>
 It is written in C++ with portability in mind, and we actively maintain builds for Windows, Linux and Android.
 </h4>

+<p align="center"><i>Logo by <a href="https://realmy.net">Realmy</a></i></p>
+
 <p align="center">
    <a href="https://dev.azure.com/suyu-emu/suyu/">
        <img src="https://dev.azure.com/suyu-emu/suyu/_apis/build/status/suyu%20mainline?branchName=master"
            alt="Azure Mainline CI Build Status">
    </a>
-    <a href="https://discord.com/invite/u77vRWY">
-        <img src="https://img.shields.io/discord/398318088170242053?color=5865F2&label=suyu&logo=discord&logoColor=white"
-            alt="Discord">
-    </a>
 </p>

 <p align="center">
-  <a href="#compatibility">Compatibility</a> |
+  <a href="compatibility.yml">Compatibility</a> |
  <a href="#development">Development</a> |
  <a href="#building">Building</a> |
  <a href="#downloads">Downloads</a> |
@ -45,7 +44,9 @@ It is written in C++ with portability in mind, and we actively maintain builds f

 ## Status

-We are trying to get the builds working. We are in need of developers. Join our discord to contribute.
+We are trying to get the builds working. We are in need of developers. Join our Discord to contribute.
+
+**Note**: This README is a fork of the original project's README, most links are broken!

 ## Compatibility

@ -84,7 +85,7 @@ If you want to contribute to the user interface translation project, please chec

 ## Support

-This project is completely free and open source, this project is made possible by many people who share the same interest. Please join the discord server to contribute.
+This project is completely free and open source, this project is made possible by many people who share the same interest. Please join the Discord server to contribute.


 ## License
--- a/compatibility.yml
+++ b/compatibility.yml
@ -0,0 +1,2 @@
+WIP 
+- MattTheTekie 
--- a/dist/qt_themes/default/icons/256x256/yuzu.png
+++ b/dist/qt_themes/default/icons/256x256/yuzu.png
--- a/dist/readme/suyu__Logo-Pill.svg
+++ b/dist/readme/suyu__Logo-Pill.svg
@ -0,0 +1,9 @@
+<svg width="2421" height="912" viewBox="0 0 2421 912" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="2421" height="912" rx="456" fill="black"/>
+<path d="M1981.76 562.559C2048.26 562.559 2085.29 540.974 2097.74 494.87H2098.58C2098.58 516.024 2097.74 543.446 2096.9 558.402H2150.07V353.155H2096.9V437.082C2096.9 489.051 2052 518.972 1999.23 518.972C1940.61 518.972 1921.48 495.702 1921.48 457.882V353.155H1868.34V469.104C1868.34 518.559 1901.97 562.559 1981.76 562.559Z" fill="white"/>
+<path d="M1622.72 649C1673.41 649 1696.68 626.588 1729.92 562.978L1838.78 353.155H1784.35L1702.08 511.453H1701.25L1608.59 353.155H1546.68L1667.59 558.402H1677.98C1656.37 599.173 1642.66 607.493 1616.07 607.493C1601.52 607.493 1588.23 604.581 1581.58 602.501V643.181C1589.47 645.68 1605.68 649 1622.72 649Z" fill="white"/>
+<path d="M1346.74 562.559C1413.26 562.559 1450.26 540.974 1462.73 494.87H1463.56C1463.56 516.024 1462.73 543.446 1461.9 558.402H1515.04V353.155H1461.9V437.082C1461.9 489.051 1417 518.972 1364.21 518.972C1305.59 518.972 1286.47 495.702 1286.47 457.882V353.155H1233.33V469.104C1233.33 518.559 1266.95 562.559 1346.74 562.559Z" fill="white"/>
+<path d="M1064.99 562.559C1171.79 562.559 1195.46 526.453 1195.46 494.857C1195.46 475.317 1186.74 458.688 1167.64 449.957C1149.78 442.474 1122.77 439.98 1086.19 438.316C1053.76 436.655 1027.15 436.655 1012.6 432.913C999.299 430.001 995.142 424.182 995.142 415.867C995.142 396.326 1018.01 386.765 1066.65 386.765C1122.77 386.765 1132.75 402.147 1133.17 422.518H1183.42C1183.42 383.861 1162.66 349 1064.99 349C986.424 349 942 376.805 942 418.361C942 435.407 948.643 451.205 964.004 459.52C979.781 468.25 1010.94 473.24 1053.35 474.485C1079.95 475.317 1111.13 476.149 1125.68 479.059C1138.99 481.971 1142.31 488.206 1142.31 496.521C1142.31 512.735 1128.18 524.791 1064.99 524.791C1000.96 524.791 992.651 507.329 992.238 490.286H942C942 521.05 958.606 562.559 1064.99 562.559Z" fill="white"/>
+<path d="M614.634 671.208C627.342 648.401 634.583 622.138 634.583 594.194C634.583 506.657 563.529 435.612 475.992 435.612C410.969 435.612 358.192 382.835 358.192 317.806C358.192 252.776 410.969 200 475.992 200C617.313 200 732 314.688 732 456C732 546.235 685.227 625.613 614.634 671.208ZM475.992 252.761C464.032 252.761 454.316 262.476 454.316 274.443C454.316 286.408 464.032 296.125 475.992 296.125C487.969 296.125 497.673 286.408 497.673 274.443C497.673 262.476 487.969 252.761 475.992 252.761ZM519.355 296.125C507.391 296.125 497.673 305.839 497.673 317.806C497.673 329.772 507.391 339.488 519.355 339.488C531.332 339.488 541.036 329.772 541.036 317.806C541.036 305.839 531.332 296.125 519.355 296.125ZM432.635 296.125C420.669 296.125 410.955 305.839 410.955 317.806C410.955 329.772 420.669 339.488 432.635 339.488C444.601 339.488 454.316 329.772 454.316 317.806C454.316 305.839 444.601 296.125 432.635 296.125ZM475.992 339.488C464.032 339.488 454.316 349.203 454.316 361.168C454.316 373.135 464.032 382.85 475.992 382.85C487.969 382.85 497.673 373.135 497.673 361.168C497.673 349.203 487.969 339.488 475.992 339.488Z" fill="#FF3554"/>
+<path d="M337.361 240.792C324.657 263.599 317.417 289.862 317.417 317.806C317.417 405.343 388.461 476.388 475.992 476.388C541.022 476.388 593.805 529.165 593.805 594.194C593.805 659.222 541.022 712 475.992 712C334.687 712 220 597.312 220 456C220 365.766 266.764 286.385 337.361 240.792ZM475.992 529.149C464.032 529.149 454.316 538.865 454.316 550.831C454.316 562.798 464.032 572.512 475.992 572.512C487.969 572.512 497.673 562.798 497.673 550.831C497.673 538.865 487.969 529.149 475.992 529.149ZM519.355 572.512C507.391 572.512 497.673 582.227 497.673 594.194C497.673 606.161 507.391 615.876 519.355 615.876C531.332 615.876 541.036 606.161 541.036 594.194C541.036 582.227 531.332 572.512 519.355 572.512ZM475.992 615.876C464.032 615.876 454.316 625.59 454.316 637.557C454.316 649.523 464.032 659.239 475.992 659.239C487.969 659.239 497.673 649.523 497.673 637.557C497.673 625.59 487.969 615.876 475.992 615.876ZM432.634 572.512C420.669 572.512 410.954 582.227 410.954 594.194C410.954 606.161 420.669 615.876 432.634 615.876C444.601 615.876 454.316 606.161 454.316 594.194C454.316 582.227 444.601 572.512 432.634 572.512Z" fill="#3A99FF"/>
+</svg>
--- a/dist/yuzu.svg
+++ b/dist/yuzu.svg
@ -1 +1,55 @@
-<svg id="svg815" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 614.4 682.67"><defs><style>.cls-1{fill:none;}.cls-2{clip-path:url(#clip-path);}.cls-3{fill:#ff3c28;}.cls-4{fill:#0ab9e6;}</style><clipPath id="clip-path"><rect class="cls-1" x="-43" y="-46.67" width="699.6" height="777.33"/></clipPath></defs><title>Artboard 1</title><g id="g823"><g id="right"><g class="cls-2"><g id="g827"><g id="g833"><path id="path835" class="cls-3" d="M340.81,138V682.08c150.26,0,272.06-121.81,272.06-272.06S491.07,138,340.81,138M394,197.55a219.06,219.06,0,0,1,0,424.94V197.55"/></g></g></g></g><g id="left"><g class="cls-2"><g id="g839"><g id="g845"><path id="path847" class="cls-4" d="M272.79,1.92C122.53,1.92.73,123.73.73,274s121.8,272.07,272.06,272.07ZM219.65,61.51v425A219,219,0,0,1,118,119.18,217.51,217.51,0,0,1,219.65,61.51"/></g></g></g></g></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="512.0px"
+   height="512.0px"
+   viewBox="0 0 512.0 512.0"
+   version="1.1"
+   id="SVGRoot"
+   sodipodi:docname="yuzu.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview532"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:zoom="4.7521782"
+     inkscape:cx="300.91464"
+     inkscape:cy="437.37838"
+     inkscape:window-width="2048"
+     inkscape:window-height="1080"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid538" />
+  </sodipodi:namedview>
+  <defs
+     id="defs527" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       d="m 394.62535,471.3827 c 12.708,-22.807 19.949,-49.07 19.949,-77.014 0,-87.537 -71.054,-158.582 -158.591,-158.582 -65.023,0 -117.8,-52.777 -117.8,-117.806 0,-65.029789 52.777,-117.8059899 117.8,-117.8059899 141.321,0 256.008,114.6879899 256.008,255.9999899 0,90.235 -46.773,169.613 -117.366,215.208 z M 255.98335,52.936011 c -11.96,0 -21.676,9.7148 -21.676,21.6816 0,11.9655 9.716,21.681597 21.676,21.681597 11.977,0 21.681,-9.716097 21.681,-21.681597 0,-11.9668 -9.704,-21.6816 -21.681,-21.6816 z m 43.363,43.363197 c -11.964,0 -21.682,9.714492 -21.682,21.681492 0,11.966 9.718,21.682 21.682,21.682 11.977,0 21.681,-9.716 21.681,-21.682 0,-11.967 -9.704,-21.681492 -21.681,-21.681492 z m -86.72,0 c -11.966,0 -21.68,9.714492 -21.68,21.681492 0,11.966 9.714,21.682 21.68,21.682 11.966,0 21.681,-9.716 21.681,-21.682 0,-11.967 -9.715,-21.681492 -21.681,-21.681492 z m 43.357,43.363492 c -11.96,0 -21.676,9.715 -21.676,21.68 0,11.967 9.716,21.682 21.676,21.682 11.977,0 21.681,-9.715 21.681,-21.682 0,-11.965 -9.704,-21.68 -21.681,-21.68 z"
+       fill="#ff3554"
+       id="path60" />
+    <path
+       d="m 117.35235,40.966411 c -12.704,22.8077 -19.943696,49.070597 -19.943696,77.014289 0,87.537 71.043696,158.582 158.574696,158.582 65.03,0 117.813,52.777 117.813,117.806 0,65.028 -52.783,117.806 -117.813,117.806 -141.305,0 -255.9919924,-114.688 -255.9919924,-256 0,-90.234 46.7638004,-169.614589 117.3609924,-215.208289 z m 138.631,288.357289 c -11.96,0 -21.676,9.716 -21.676,21.682 0,11.967 9.716,21.681 21.676,21.681 11.977,0 21.681,-9.714 21.681,-21.681 0,-11.966 -9.704,-21.682 -21.681,-21.682 z m 43.363,43.363 c -11.964,0 -21.682,9.715 -21.682,21.682 0,11.967 9.718,21.682 21.682,21.682 11.977,0 21.681,-9.715 21.681,-21.682 0,-11.967 -9.704,-21.682 -21.681,-21.682 z m -43.363,43.364 c -11.96,0 -21.676,9.714 -21.676,21.681 0,11.966 9.716,21.682 21.676,21.682 11.977,0 21.681,-9.716 21.681,-21.682 0,-11.967 -9.704,-21.681 -21.681,-21.681 z m -43.358,-43.364 c -11.965,0 -21.68,9.715 -21.68,21.682 0,11.967 9.715,21.682 21.68,21.682 11.967,0 21.682,-9.715 21.682,-21.682 0,-11.967 -9.715,-21.682 -21.682,-21.682 z"
+       fill="#3a99ff"
+       id="path62" />
+  </g>
+</svg>