armsx/ARMSX3
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX3.git synced 2026-08-24 16:58:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove whitespace

Browse Source
This commit is contained in:
Margen67
2023-02-15 08:58:02 +01:00
committed by Megamouse
parent 75fbb3d551
commit 5bb89328d0
74 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/ISSUE_TEMPLATE/1-regression-report.yml
+6 -6
View File
@@ -29,8 +29,8 @@ body:
Please provide the _exact_ build (or commit) information that introduced the regression you're reporting.
* Please see [How to find the build that caused a regression](https://wiki.rpcs3.net/index.php?title=Help:Using_different_versions_of_RPCS3#How_to_find_the_build_that_caused_a_regression.3F) in our wiki.
* You can find [History of RPCS3 builds](https://rpcs3.net/compatibility?b) here.
Make sure you're running with settings as close to default as possible
Make sure you're running with settings as close to default as possible
* **Do NOT enable any emulator game patches when reporting issues**
* Only change settings that are required for the game to work
- type: input
@@ -48,7 +48,7 @@ body:
Obtaining the log file:
* Run the game until you find the regression.
* Completely close RPCS3 and locate the log file.
RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
* On Windows it will be in the RPCS3 directory near the executable
* On Linux it will be in ```~/.cache/rpcs3/```
@@ -70,21 +70,21 @@ body:
* To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_.
* Captures will be stored in RPCS3 folder → captures.
* To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html).
- type: textarea
- type: textarea
id: captures
attributes:
label: Attach capture files for visual issues
description: Compress your capture with 7z, Rar etc. and attach it here, or upload it to the cloud (Dropbox, Mega etc) and add a link to it.
validations:
required: false
- type: textarea
- type: textarea
id: system-info
attributes:
label: System configuration
description: Provide information about your system, such as operating system, CPU and GPU model, GPU driver version and other information that describes your system configuration.
validations:
required: false
- type: textarea
- type: textarea
id: other-details
attributes:
label: Other details
.github/ISSUE_TEMPLATE/2-bug-report.yml
+6 -6
View File
@@ -28,13 +28,13 @@ body:
attributes:
value: |
# Log files
Provide a log file that includes the bug you're reporting.
Obtaining the log file:
* Run the game until you find the regression.
* Completely close RPCS3 and locate the log file.
RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
* On Windows it will be in the RPCS3 directory near the executable
* On Linux it will be in ```~/.cache/rpcs3/```
@@ -55,21 +55,21 @@ body:
* To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_.
* Captures will be stored in RPCS3 folder → captures.
* To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html).
- type: textarea
- type: textarea
id: captures
attributes:
label: Attach capture files for visual issues
description: Compress your capture with 7z, Rar etc. and attach it here, or upload it to the cloud (Dropbox, Mega etc) and add a link to it.
validations:
required: false
- type: textarea
- type: textarea
id: system-info
attributes:
label: System configuration
description: Provide information about your system, such as operating system, CPU and GPU model, GPU driver version and other information that describes your system configuration.
validations:
required: false
- type: textarea
- type: textarea
id: other-details
attributes:
label: Other details
.github/ISSUE_TEMPLATE/3-feature-request.yml
+1 -1
View File
@@ -29,7 +29,7 @@ body:
* Why your feature is important to RPCS3.
* If the feature is implemented in other projects, attach screenshots.
* If this feature is something that a game is trying to use, upload a log file for it.
RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon).
* On Windows it will be in the RPCS3 directory near the executable
* On Linux it will be in ```~/.cache/rpcs3/```
Utilities/bin_patch.cpp
+1 -1
View File
@@ -756,7 +756,7 @@ static usz apply_modification(std::basic_string<u32>& applied, const patch_engin
// NOP filled
std::fill_n(vm::get_super_ptr<u32>(addr), p.value.long_value, 0x60000000);
// Check if already registered by previous code allocation
// Check if already registered by previous code allocation
if (relocate_instructions_at != addr)
{
// Register code
bin/GuiConfigs/Darker Style by TheMitoSan.qss
+6 -6
View File
@@ -1,5 +1,5 @@
/*
TheMitoSan Dark-Theme for RPCS3
/*
TheMitoSan Dark-Theme for RPCS3
Based on Kuroi (Dark) by Ani
by themitosan @ twitter.com/themitosan
Ani @ https://github.com/AniLeo
@@ -135,7 +135,7 @@ QPushButton::disabled {
}
QPushButton::pressed {
background-color: #333;
background-color: #333;
}
/* Log and Debugger borders */
@@ -193,7 +193,7 @@ QListWidget::item:hover {
}
/* Pad Settings: Controller Image */
QLabel#l_controller {
QLabel#l_controller {
color: #FFF;
}
@@ -230,8 +230,8 @@ QLabel#color_button {
}
/* Search bar on main toolbar */
QLineEdit#mw_searchbar {
margin-left: 0.7em;
QLineEdit#mw_searchbar {
margin-left: 0.7em;
color: #ecf0f1;
}
bin/GuiConfigs/Envy.qss
+10 -10
View File
@@ -1,4 +1,4 @@
/*
/*
Envy theme for RPCS3 by drysalter (https://github.com/drysalter)
03/04/2019
*/
@@ -19,7 +19,7 @@ Candy Red: #ff007a
Yellow: #f2d571
Fuchsia: #ff00ff
Orange: #ff6000
Cyan: #3498d8
Cyan: #3498d8
*/
@@ -209,7 +209,7 @@ QRadioButton::indicator:unchecked {
}
QRadioButton::indicator:disabled {
background-color: #4d5058;
background-color: #4d5058;
}
/* Combo Boxes */
@@ -272,7 +272,7 @@ QSlider::handle:horizontal {
border: 1px solid #5c5c5c;
border-radius: 0.1em;
width: 18px;
margin: -2px 2;
margin: -2px 2;
}
QSlider::handle:horizontal:hover {
@@ -335,7 +335,7 @@ QPushButton:disabled {
}
QPushButton::pressed {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d3038, stop: 1 #2d3038);
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d3038, stop: 1 #2d3038);
}
/* Spinboxes */
@@ -479,7 +479,7 @@ QListWidget::indicator:disabled {
}
/* Pad Settings: Controller Image */
QLabel#l_controller {
QLabel#l_controller {
color: #8cf944;
}
@@ -505,7 +505,7 @@ QLabel#color_button {
}
/* Search bar on main toolbar */
QLineEdit#mw_searchbar {
QLineEdit#mw_searchbar {
color: #ecf0f1;
background-color: #2d3038;
border: 1px solid #f8f8f8;
@@ -513,14 +513,14 @@ QLineEdit#mw_searchbar {
padding-left: 5px;
}
QLineEdit#mw_searchbar:hover {
QLineEdit#mw_searchbar:hover {
color: #ecf0f1;
background-color: #2d3038;
border: 1px solid #8cf944;
margin: 15px;
}
QLineEdit#mw_searchbar:focus {
QLineEdit#mw_searchbar:focus {
border: 1px solid #8cf944;
}
@@ -566,7 +566,7 @@ QTableView {
QTableView::item:hover {
color: #8cf944;
}
}
/* Game Icon Background */
QLabel#gamelist_icon_background_color {
bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss
+7 -7
View File
@@ -1,5 +1,5 @@
/*
ModernBlue Theme for RPCS3
/*
ModernBlue Theme for RPCS3
by themitosan @ twitter.com/themitosan
(2017.12.12)
*/
@@ -124,7 +124,7 @@ QGroupBox::title {
/* Buttons */
QPushButton {
background-color: #46598b;
color: #fff;
color: #fff;
}
QPushButton::disabled {
@@ -133,7 +133,7 @@ QPushButton::disabled {
}
QPushButton::pressed {
background-color: #172038;
background-color: #172038;
}
/* Log and Debugger borders */
@@ -190,7 +190,7 @@ QListWidget::item:hover {
}
/* Pad Settings: Controller Image */
QLabel#l_controller {
QLabel#l_controller {
color: #fff;
}
@@ -227,8 +227,8 @@ QLabel#color_button {
}
/* Search bar on main toolbar */
QLineEdit#mw_searchbar {
margin-left: 0.7em;
QLineEdit#mw_searchbar {
margin-left: 0.7em;
color: #ecf0f1;
}
bin/GuiConfigs/Skyline (Nightfall).qss
+8 -8
View File
@@ -105,7 +105,7 @@ QToolButton:hover {
}
/* Search bar in Main Toolbar */
QLineEdit#mw_searchbar {
QLineEdit#mw_searchbar {
color: #455971;
background-color: #FFFFFF;
border: 1px solid #999999;
@@ -113,15 +113,15 @@ QLineEdit#mw_searchbar {
padding-left: 5px;
}
QLineEdit#mw_searchbar:hover {
margin-left: 0.7em;
QLineEdit#mw_searchbar:hover {
margin-left: 0.7em;
color: #0074e7;
background-color: #FFFFFF;
border: 1px solid #0071ec;
margin: 15px;
}
QLineEdit#mw_searchbar:focus {
QLineEdit#mw_searchbar:focus {
border: 1px solid #0074e7;
}
@@ -148,7 +148,7 @@ QSlider::handle:horizontal {
border: 1px solid #5c5c5c;
border-radius: 0.1em;
width: 18px;
margin: -2px 2;
margin: -2px 2;
}
QSlider::handle:horizontal:hover {
@@ -242,7 +242,7 @@ QRadioButton::indicator:unchecked {
}
QRadioButton::indicator:disabled {
background-color: #455971;
background-color: #455971;
}
/* Checkboxes */
@@ -533,7 +533,7 @@ QProgressBar::chunk {
}
/* Pad Settings: Controller Image */
QLabel#l_controller {
QLabel#l_controller {
color: #0074e7;
}
@@ -554,7 +554,7 @@ QHeaderView::section {
background-color: #111525;
color: #FFFFFF;
padding-top: 3px;
padding-left: 3px;
padding-left: 3px;
height: 20px;
border: none;
}
bin/GuiConfigs/Skyline.qss
+8 -8
View File
@@ -105,7 +105,7 @@ QToolButton:hover {
}
/* Search bar in Main Toolbar */
QLineEdit#mw_searchbar {
QLineEdit#mw_searchbar {
color: #455971;
background-color: #FFFFFF;
border: 1px solid #999999;
@@ -113,15 +113,15 @@ QLineEdit#mw_searchbar {
padding-left: 5px;
}
QLineEdit#mw_searchbar:hover {
margin-left: 0.7em;
QLineEdit#mw_searchbar:hover {
margin-left: 0.7em;
color: #455971;
background-color: #FFFFFF;
border: 1px solid #0071ec;
margin: 15px;
}
QLineEdit#mw_searchbar:focus {
QLineEdit#mw_searchbar:focus {
border: 1px solid #0071ec;
}
@@ -148,7 +148,7 @@ QSlider::handle:horizontal {
border: 1px solid #5c5c5c;
border-radius: 0.1em;
width: 18px;
margin: -2px 2;
margin: -2px 2;
}
QSlider::handle:horizontal:disabled {
@@ -254,7 +254,7 @@ QRadioButton::indicator:unchecked {
}
QRadioButton::indicator:disabled {
background-color: #455971;
background-color: #455971;
}
/* Checkboxes */
@@ -552,7 +552,7 @@ QProgressBar::chunk {
}
/* Pad Settings: Controller Image */
QLabel#l_controller {
QLabel#l_controller {
color: #4343c1;
}
@@ -573,7 +573,7 @@ QHeaderView::section {
background-color: #FFFFFF;
color: #455971;
padding-top: 3px;
padding-left: 3px;
padding-left: 3px;
height: 20px;
border: none;
}
bin/GuiConfigs/YoRHa by Ani.qss
+2 -2
View File
@@ -456,10 +456,10 @@ QSlider#sizeSlider::groove:horizontal {
height: 1.5em;
}
/*
/*
On Patch Creator, it's the patch validation label
since we can't avoid repainting color, let's bold it instead
*/
QLabel#validLabel {
font-weight: 600;
}
}
buildfiles/msvc/common_default_macros.props
+2 -2
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Common default props for defining properties with macros. Import right after Microsoft.Cpp.Default.props -->
<ImportGroup Label="PropertySheets" />
@@ -8,4 +8,4 @@
</PropertyGroup>
<ItemDefinitionGroup />
<ItemGroup />
</Project>
</Project>
rpcs3/CMakeLists.txt
+2 -2
View File
@@ -187,13 +187,13 @@ elseif(WIN32)
# If Qt5 is installed from vcpkg
list(APPEND _QT5_TOOLS_PATHS "${Qt5_DIR}/../../../tools/qt5$<$<CONFIG:Debug>:/debug>/bin/")
add_custom_command(TARGET rpcs3 POST_BUILD
COMMAND set PATH=${_QT5_TOOLS_PATHS}$<SEMICOLON>%PATH%
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_SOURCE_DIR}/bin" "$<TARGET_FILE_DIR:rpcs3>"
# If Qt5 is installed from vcpkg, add binary path to PATH
# otherwise windeployqt tool won't be able to locate necessary dlls
COMMAND set PATH=${Qt5_DIR}/../../../$<$<CONFIG:Debug>:debug/>bin/$<SEMICOLON>%PATH%
COMMAND set PATH=${Qt5_DIR}/../../../$<$<CONFIG:Debug>:debug/>bin/$<SEMICOLON>%PATH%
COMMAND "${_WINDEPLOYQT}" --no-angle --no-compiler-runtime --no-opengl-sw --no-patchqt --no-translations --no-quick --plugindir "$<TARGET_FILE_DIR:rpcs3>/qt/plugins" $<$<CONFIG:Debug>:--debug> $<$<CONFIG:Release>:--release> "$<TARGET_FILE:rpcs3>")
endif()
rpcs3/Crypto/aes.h
+1 -1
View File
@@ -124,7 +124,7 @@ int aes_crypt_cbc( aes_context *ctx,
* both encryption and decryption. So a context initialized with
* aes_setkey_enc() for both AES_ENCRYPT and AES_DECRYPT.
*
* both
* both
* \param ctx AES context
* \param mode AES_ENCRYPT or AES_DECRYPT
* \param length length of the input data
rpcs3/Crypto/key_vault.h
+1 -1
View File
@@ -245,7 +245,7 @@ constexpr s64 PAID_30 = 0x1070000023000001L; // spu_token_processor.self; CoreOS
constexpr s64 PAID_31 = 0x1070000024000001L; // sv_iso_spu_module.self; CoreOS; same for CEX DEX DECR
constexpr s64 PAID_32 = 0x1070000025000001L; // aim_spu_module.self; CoreOS; same for CEX DEX DECR
constexpr s64 PAID_33 = 0x1070000026000001L; // ss_sc_init.self; [2.43 JIG PUP]
constexpr s64 PAID_34 = 0x1070000027000001L; // dispatcher.fself; lv1;
constexpr s64 PAID_34 = 0x1070000027000001L; // dispatcher.fself; lv1;
constexpr s64 PAID_35 = 0x1070000028000001L; // factory_data_mngr_server.fself; JIG lv1 proc
constexpr s64 PAID_36 = 0x1070000029000001L; // fdm_spu_module.self; [2.43 JIG PUP]
constexpr s64 PAID_37 = 0x107000002A000001L;
rpcs3/Crypto/unpkg.cpp
+1 -1
View File
@@ -1041,7 +1041,7 @@ package_error package_reader::extract_data(std::deque<package_reader>& readers,
{
// Use a seperate map for each reader. We need to check if the target app version exists for each package in sequence.
std::map<std::string, install_entry*> all_install_entries;
if (error == package_error::no_error)
{
// Check if this package is allowed to be installed on top of the existing data
rpcs3/Emu/Cell/ErrorCodes.h
+1 -1
View File
@@ -34,7 +34,7 @@ class error_code
{
}
public:
public:
// Implementation must be provided independently
static s32 error_report(s32 result, const logs::message* channel, const char* fmt, const fmt_type_info* sup, const u64* args);
rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include <thread>
// SONIC THE HEDGEDOG: a fix for a race condition between SPUs and PPUs causing missing graphics (SNR is overriden when non-empty)
// SONIC THE HEDGEDOG: a fix for a race condition between SPUs and PPUs causing missing graphics (SNR is overriden when non-empty)
void WaitForSPUsToEmptySNRs(ppu_thread& ppu, u32 spu_id, u32 snr_mask)
{
ppu.state += cpu_flag::wait;
rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
+1 -1
View File
@@ -222,7 +222,7 @@ error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr<char> msgString,
auto& ppu = *get_current_cpu_thread();
lv2_obj::sleep(ppu);
// PS3 memory must not be accessed by Main thread
// PS3 memory must not be accessed by Main thread
std::string msg_string = msgString.get_ptr();
// Run asynchronously in GUI thread
rpcs3/Emu/Cell/Modules/cellRec.cpp
+2 -2
View File
@@ -1311,7 +1311,7 @@ u32 cellRecQueryMemSize(vm::cptr<CellRecParam> pParam)
{
return 0x900000;
}
u32 video_size = 0x600000; // 6 MB
u32 audio_size = 0x100000; // 1 MB
u32 external_input_size = 0;
@@ -1616,7 +1616,7 @@ error_code cellRecSetInfo(s32 setInfo, u64 value)
{
return CELL_REC_ERROR_INVALID_VALUE;
}
for (u32 i = 0; i < scene_metadata->tagNum; i++)
{
if (!scene_metadata->tag[i] ||
rpcs3/Emu/Cell/Modules/cellSpurs.cpp
+1 -1
View File
@@ -5461,7 +5461,7 @@ DECLARE(ppu_module_manager::cellSpurs)("cellSpurs", [](ppu_static_module* _this)
_this->add_init_func([](ppu_static_module*)
{
const auto val = g_cfg.core.spu_accurate_reservations ? MFF_PERFECT : MFF_FORCED_HLE;
REINIT_FUNC(cellSpursSetPriorities).flag(val);
REINIT_FUNC(cellSpursAddWorkload).flag(val);
REINIT_FUNC(cellSpursAddWorkloadWithAttribute).flag(val);

Some files were not shown because too many files have changed in this diff Show More