From 02e6dc42ed03df550a49e547d05df1441b35fdad Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Mon, 26 Jul 2021 19:21:31 +0200 Subject: [PATCH] early-access version 1919 --- README.md | 2 +- src/input_common/tas/tas_input.h | 4 +- .../frontend/maxwell/control_flow.cpp | 2 +- src/shader_recompiler/object_pool.h | 1 + src/yuzu/applets/qt_web_browser.cpp | 5 +- src/yuzu/configuration/configure_tas.ui | 54 +++++++++++++++++++ src/yuzu/main.ui | 2 +- 7 files changed, 62 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 831db7465..6c7e13605 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 1916. +This is the source code for early-access 1919. ## Legal Notice diff --git a/src/input_common/tas/tas_input.h b/src/input_common/tas/tas_input.h index 5d3fb66bf..c9a0f8f32 100755 --- a/src/input_common/tas/tas_input.h +++ b/src/input_common/tas/tas_input.h @@ -13,8 +13,8 @@ /* To play back TAS scripts on Yuzu, select the folder with scripts in the configuration menu below -Emulation -> Configure TAS. The file itself has normal text format and has to be called -script0-1.txt for controller 1, script0-2.txt for controller 2 and so forth (with max. 8 players). +Tools -> Configure TAS. The file itself has normal text format and has to be called script0-1.txt +for controller 1, script0-2.txt for controller 2 and so forth (with max. 8 players). A script file has the same format as TAS-nx uses, so final files will look like this: diff --git a/src/shader_recompiler/frontend/maxwell/control_flow.cpp b/src/shader_recompiler/frontend/maxwell/control_flow.cpp index 1a954a509..efe457baa 100755 --- a/src/shader_recompiler/frontend/maxwell/control_flow.cpp +++ b/src/shader_recompiler/frontend/maxwell/control_flow.cpp @@ -73,7 +73,7 @@ Token OpcodeToken(Opcode opcode) { return Token::PBK; case Opcode::PCNT: case Opcode::CONT: - return Token::PBK; + return Token::PCNT; case Opcode::PEXIT: case Opcode::EXIT: return Token::PEXIT; diff --git a/src/shader_recompiler/object_pool.h b/src/shader_recompiler/object_pool.h index f8b255b66..f3b12d04b 100755 --- a/src/shader_recompiler/object_pool.h +++ b/src/shader_recompiler/object_pool.h @@ -63,6 +63,7 @@ private: used_objects = std::exchange(rhs.used_objects, 0); num_objects = std::exchange(rhs.num_objects, 0); storage = std::move(rhs.storage); + return *this; } Chunk(Chunk&& rhs) noexcept diff --git a/src/yuzu/applets/qt_web_browser.cpp b/src/yuzu/applets/qt_web_browser.cpp index 87e1750e4..652d99570 100755 --- a/src/yuzu/applets/qt_web_browser.cpp +++ b/src/yuzu/applets/qt_web_browser.cpp @@ -107,12 +107,12 @@ void QtNXWebEngineView::LoadLocalWebPage(const std::string& main_url, is_local = true; LoadExtractedFonts(); + FocusFirstLinkElement(); SetUserAgent(UserAgent::WebApplet); SetFinished(false); SetExitReason(Service::AM::Applets::WebExitReason::EndButtonPressed); SetLastURL("http://localhost/"); StartInputThread(); - FocusFirstLinkElement(); load(QUrl(QUrl::fromLocalFile(QString::fromStdString(main_url)).toString() + QString::fromStdString(additional_args))); @@ -122,6 +122,7 @@ void QtNXWebEngineView::LoadExternalWebPage(const std::string& main_url, const std::string& additional_args) { is_local = false; + FocusFirstLinkElement(); SetUserAgent(UserAgent::WebApplet); SetFinished(false); SetExitReason(Service::AM::Applets::WebExitReason::EndButtonPressed); @@ -129,8 +130,6 @@ void QtNXWebEngineView::LoadExternalWebPage(const std::string& main_url, StartInputThread(); load(QUrl(QString::fromStdString(main_url) + QString::fromStdString(additional_args))); - - FocusFirstLinkElement(); } void QtNXWebEngineView::SetUserAgent(UserAgent user_agent) { diff --git a/src/yuzu/configuration/configure_tas.ui b/src/yuzu/configuration/configure_tas.ui index 445904d8f..6574943db 100755 --- a/src/yuzu/configuration/configure_tas.ui +++ b/src/yuzu/configuration/configure_tas.ui @@ -14,6 +14,60 @@ Dialog + + + + + + Tool Assisted Speedrun tool + + + + + + This tool reads controller input from a script files under the same format as TAS-nx files. For more delailed explanation please consult the FAQ on the yuzu website. + + + true + + + + + + + How to use it: + + + true + + + + + + + Ctrl + F5: Start or stop TAS bot + + + + + + + Ctrl + F6: Reload file or restart bot from the beggining + + + + + + + Ctrl + F7: Start or stop recording input from player 1 + + + + + + + + diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui index 31c1a20f3..653c010d8 100755 --- a/src/yuzu/main.ui +++ b/src/yuzu/main.ui @@ -72,7 +72,6 @@ - @@ -101,6 +100,7 @@ +