ShuriZma
/
suyu
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: ShuriZma:99b0e75226576f339f8a15b9baf3e3d3134975dc
Branches Tags
ShuriZma:master
ShuriZma:metal-dev
ShuriZma:dev
ShuriZma:Chaffidy-doo-dah
ShuriZma:textureimage-void
ShuriZma:optimize-spirv
ShuriZma:fiber
ShuriZma:alpha
ShuriZma:qlaunch-work
ShuriZma:more-f18-changes
ShuriZma:prerelease-check-fix
ShuriZma:forgejo-ci-testing
ShuriZma:beta
ShuriZma:ddutchie/uitweaks
ShuriZma:ddutchie/citest
ShuriZma:revert-e9eb3f37
ShuriZma:ddutchie/ci-tweaks
ShuriZma:ci-fijxu-testing
ShuriZma:ccache-ci
ShuriZma:niansa-appimage-fix
ShuriZma:niansa-ci-ccache
ShuriZma:master-backup
ShuriZma:v0.0.4
ShuriZma:v0.0.3
ShuriZma:v0.0.1
...
compare: ShuriZma:a0daa93c1712385dd04035cedc0b6310c63a38c7
Branches Tags
ShuriZma:metal-dev
ShuriZma:dev
ShuriZma:Chaffidy-doo-dah
ShuriZma:textureimage-void
ShuriZma:master
ShuriZma:optimize-spirv
ShuriZma:fiber
ShuriZma:alpha
ShuriZma:qlaunch-work
ShuriZma:more-f18-changes
ShuriZma:prerelease-check-fix
ShuriZma:forgejo-ci-testing
ShuriZma:beta
ShuriZma:ddutchie/uitweaks
ShuriZma:ddutchie/citest
ShuriZma:revert-e9eb3f37
ShuriZma:ddutchie/ci-tweaks
ShuriZma:ci-fijxu-testing
ShuriZma:ccache-ci
ShuriZma:niansa-appimage-fix
ShuriZma:niansa-ci-ccache
ShuriZma:master-backup
ShuriZma:v0.0.4
ShuriZma:v0.0.3
ShuriZma:v0.0.1

6 Commits
99b0e75226 ... a0daa93c17

Author SHA1 Message Date
cass_058 a0daa93c17 Merge branch 'dev' into 'dev' 
Disable compiling telemetry code by default

See merge request suyu-emu/suyu!81
 2024-03-08 01:18:18 +00:00
cass_058 e1716384a0 Merge branch suyu:dev into dev 2024-03-08 01:18:16 +00:00
zqpvr 5db58434e5 Update settings.cpp 2024-03-08 00:40:12 +00:00
zqpvr 664e77b4d8 Update configure.ui 2024-03-08 00:23:54 +00:00
cass_058 abb224fe1d Merge branch suyu:dev into dev 2024-03-08 00:22:56 +00:00
cass_058 9786f8a345 Disable compiling telemetry code by default 2024-03-07 21:22:32 +00:00
3 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -30,7 +30,7 @@ set(QT6_LOCATION "" CACHE PATH "Additional Location to search for Qt6 libraries
option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF) option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF) CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON) option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" OFF)
option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}") option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}")

2
src/common/settings.cpp
View File

@ -114,7 +114,7 @@ void LogSettings() {
LOG_INFO(Config, "{}: {}", name, Common::FS::PathToUTF8String(path)); LOG_INFO(Config, "{}: {}", name, Common::FS::PathToUTF8String(path));
}; };
LOG_INFO(Config, "yuzu Configuration:"); LOG_INFO(Config, "suyu Configuration:");
for (auto& [category, settings] : values.linkage.by_category) { for (auto& [category, settings] : values.linkage.by_category) {
for (const auto& setting : settings) { for (const auto& setting : settings) {
if (setting->Id() == values.yuzu_token.Id()) { if (setting->Id() == values.yuzu_token.Id()) {

2
src/yuzu/configuration/configure.ui
View File

@ -17,7 +17,7 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>yuzu Configuration</string> <string>suyu Configuration</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>