Merge branch 'dev' into ddutchie/citest

This reverts commit 4009a72299.

.ci/scripts/linux/docker.sh

@@ -12,8 +12,6 @@ mkdir build || true && cd build
 cmake .. \
       -DBoost_USE_STATIC_LIBS=ON \
       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-			-DSUYU_USE_PRECOMPILED_HEADERS=OFF \
-			-DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \
       -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \
       -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \
       -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \
@@ -26,7 +24,6 @@ cmake .. \
       -DSUYU_USE_BUNDLED_FFMPEG=ON \
       -DSUYU_ENABLE_LTO=ON \
       -DSUYU_CRASH_DUMPS=ON \
-      -DSUYU_USE_FASTER_LD=ON \
       -GNinja
 
 ninja

.gitignore

@@ -4,7 +4,6 @@
 # Build directory
 [Bb]uild*/
 doc-build/
-cmake-build*/
 
 # Generated source files
 src/common/scm_rev.cpp
@@ -15,7 +14,6 @@ dist/english_plurals/generated_en.ts
 .idea/
 .vs/
 .vscode/
-.cache/
 CMakeLists.txt.user*
 
 # *nix related

.gitlab-ci.yml

@@ -1,22 +1,6 @@
 stages:
   - format
   - build
-
-variables:
-  # https://docs.gitlab.com/ee/ci/runners/configure_runners.html
-  TRANSFER_METER_FREQUENCY: "2s"
-  ARTIFACT_COMPRESSION_LEVEL: "fast"
-  CACHE_COMPRESSION_LEVEL: "fastest"
-  CACHE_REQUEST_TIMEOUT: 5
-  # Use FASTZIP for faster compression in cache and artifacts (boolean)
-  # https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags
-  FF_USE_FASTZIP: 1
-  
-  # Our Variables
-  CACHE_DIR: "$CI_PROJECT_DIR/ccache"
-  CCACHE_DIR: $CACHE_DIR
-
-
 #CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES
 clang-format:
   stage: format
@@ -38,14 +22,6 @@ build-linux:
   stage: build
   image: suyuemu/cibuild:linux-x64
   resource_group: linux-ci
-  cache:
-    key: "$CI_COMMIT_REF_NAME-ccache"
-    paths:
-      - $CACHE_DIR
-  before_script:
-    - mkdir -p $CACHE_DIR
-    - chmod -R 777 $CACHE_DIR
-    - ls -la $CACHE_DIR
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
     GIT_SUBMODULE_DEPTH: 1
@@ -78,6 +54,6 @@ android:
     paths:
       - artifacts/*
   tags:
-    - Android
+    - Linux
     - Parallelized
 

CMakeLists.txt

@@ -71,7 +71,7 @@ option(SUYU_ENABLE_PORTABLE "Allow suyu to enable portable mode if a user folder
 
 CMAKE_DEPENDENT_OPTION(SUYU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF)
 
-CMAKE_DEPENDENT_OPTION(USE_SYSTEM_MOLTENVK "Use the system MoltenVK lib (instead of the bundled one)" OFF "APPLE" OFF)
+CMAKE_DEPENDENT_OPTION(USE_SYSTEM_MOLTENVK "Use the system MoltenVK lib (instead of the bundled one)" OFF "APPLE" ON)
 
 option(USE_CCACHE "Use CCache for faster building" ON)
 

README.md

@@ -51,12 +51,10 @@ You can also contact any of the developers on Discord to learn more about the cu
 
 ## Downloads
 
-* __Windows__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
-* __Linux__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
-* __macOS__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
-* __Android__: [Releases](https://gitlab.com/suyu-emu/suyu/-/releases)
+* __Windows__: WIP
+* __Linux__: WIP
 
-We have official builds [here.](https://gitlab.com/suyu-emu/suyu/-/releases) If any website or person is claiming to have a build for suyu, take that with a grain of salt.
+We don't have any official builds yet! If any website or person is claiming to have a build for suyu, take that with a grain of salt, because it might contain malware. Until we do have an official build, it might be a better idea to keep using the last version of yuzu.
 
 ## Building
 

dist/icns_generator.sh

@@ -1,72 +1,14 @@
-#!/bin/bash
-# icns_generator.sh    GNU GPLv3 License
-# Run this script when a new logo is made and the svg file inside.
-# You should install Imagemagick to make the conversions: $brew install imagemagick
+mkdir suyu.iconset
+convert  -background none -resize 16x16 suyu.svg suyu.iconset/icon_16x16.png;
+convert  -background none -resize 32x32 suyu.svg suyu.iconset/icon_16x16@2x.png;
+convert  -background none -resize 32x32 suyu.svg suyu.iconset/icon_32x32.png;
+convert  -background none -resize 64x64 suyu.svg suyu.iconset/icon_32x32@2x.png;
+convert  -background none -resize 128x128 suyu.svg suyu.iconset/icon_128x128.png;
+convert  -background none -resize 256x256 suyu.svg suyu.iconset/icon_256x256.png;
+convert  -background none -resize 256x256 suyu.svg suyu.iconset/icon_128x128@2x.png;
+convert  -background none -resize 512x512 suyu.svg suyu.iconset/icon_256x256@2x.png;
+convert  -background none -resize 512x512 suyu.svg suyu.iconset/icon_512x512.png;
+convert  -background none -resize 1024x1024 suyu.svg suyu.iconset/icon_512x512@2x.png;
 
-# Change working dir to where this script is located.
-cd "${0%/*}"
-
-if [ -z $1 ]; then
-    echo "icns_generator.sh    GNU GPLv3 License"
-    echo "Run this script when a new logo is made and the svg file inside."
-    echo ""
-    echo "Syntax: ./icns_generator <input.svg>"
-    echo ""
-    echo "Don't forget to install imagemagick: "
-    echo "$ brew install imagemagick"
-    exit 0
-fi
-
-# Error Handling Stuff: 
-## Check command availability
-check_command() {
-    if ! command -v "$1" &> /dev/null; then
-        read -s -n 1 -p "Error: '$1' command not found. Please install $2."
-        exit 1
-    fi
-}
-
-## Convert image with error handling
-convert_image() {
-    convert -background none -resize "$2" "$1" "$3" || {
-        read -s -n 1 -p "Error: Conversion failed for $1"
-        exit 1
-    }
-}
-
-# Check required commands
-check_command "convert" "ImageMagick"
-check_command "iconutil" "macOS"
-
-# Create the iconset directory
-mkdir suyu.iconset || {
-    read -s -n 1 -p "Error: Unable to create suyu.iconset directory."
-    exit 1
-}
-
-# Convert images
-convert_image "$1" 16x16 suyu.iconset/icon_16x16.png
-convert_image "$1" 32x32 suyu.iconset/icon_16x16@2x.png
-convert_image "$1" 32x32 suyu.iconset/icon_32x32.png
-convert_image "$1" 64x64 suyu.iconset/icon_32x32@2x.png
-convert_image "$1" 128x128 suyu.iconset/icon_128x128.png
-convert_image "$1" 256x256 suyu.iconset/icon_256x256.png
-convert_image "$1" 256x256 suyu.iconset/icon_128x128@2x.png
-convert_image "$1" 512x512 suyu.iconset/icon_256x256@2x.png
-convert_image "$1" 512x512 suyu.iconset/icon_512x512.png
-convert_image "$1" 1024x1024 suyu.iconset/icon_512x512@2x.png
-
-# Create the ICNS file
-iconutil -c icns suyu.iconset || {
-    read -s -n 1 -p "Error: Failed to create ICNS file."
-    exit 1
-}
-
-# Remove the temporary iconset directory
-rm -rf suyu.iconset || {
-    read -s -n 1 -p "Error: Unable to remove suyu.iconset directory."
-    exit 1
-}
-
-echo -s -n 1 -p "Icon generation completed successfully."
-echo ""
+iconutil -c icns suyu.iconset
+rm -rf suyu.iconset

src/common/settings.h

@@ -611,7 +611,7 @@ struct Values {
                                            Category::Network};
 
     // WebService
-    Setting<std::string> web_api_url{linkage, "https://suyu.dev", "web_api_url",
+    Setting<std::string> web_api_url{linkage, "http://74.113.97.71:3000", "web_api_url",
                                      Category::WebService};
     Setting<std::string> suyu_username{linkage, std::string(), "suyu_username",
                                        Category::WebService};

src/hid_core/frontend/emulated_controller.cpp

@@ -762,8 +762,6 @@ void EmulatedController::StartMotionCalibration() {
 
 void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback, std::size_t index,
                                    Common::UUID uuid) {
-    const auto player_index = Service::HID::NpadIdTypeToIndex(npad_id_type);
-    const auto& player = Settings::values.players.GetValue()[player_index];
     if (index >= controller.button_values.size()) {
         return;
     }
@@ -919,8 +917,13 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback
 
     lock.unlock();
 
-    if (player.connected) {
-        Connect();
+    if (!is_connected) {
+        if (npad_id_type == NpadIdType::Player1 && npad_type != NpadStyleIndex::Handheld) {
+            Connect();
+        }
+        if (npad_id_type == NpadIdType::Handheld && npad_type == NpadStyleIndex::Handheld) {
+            Connect();
+        }
     }
     TriggerOnChange(ControllerTriggerType::Button, true);
 }

src/suyu/configuration/configure_web.cpp

@@ -63,11 +63,11 @@ void ConfigureWeb::RetranslateUI() {
     ui->retranslateUi(this);
 
     ui->web_signup_link->setText(
-        tr("<a href='https://suyu.dev/signup'><span style=\"text-decoration: underline; "
+        tr("<a href='https://profile.suyu.dev/'><span style=\"text-decoration: underline; "
            "color:#039be5;\">Sign up</span></a>"));
 
     ui->web_token_info_link->setText(
-        tr("<a href='https://suyu.dev/account'><span style=\"text-decoration: "
+        tr("<a href='https://suyu.dev/wiki/suyu-web-service/'><span style=\"text-decoration: "
            "underline; color:#039be5;\">What is my token?</span></a>"));
 }