From 2ab27ef42a36483daec0edecad64b0a2f95e8c07 Mon Sep 17 00:00:00 2001 From: AKuHAK <621640+AKuHAK@users.noreply.github.com> Date: Sat, 26 Nov 2022 00:18:20 +0200 Subject: [PATCH] formatter: apply editorconig into various files --- .github/CONTRIBUTING.md | 2 +- .github/workflows/scripts/linux/appimage.sh | 2 +- bin/PCSX2_keys.ini.default | 2 +- bin/docs/GPL.html | 10 +-- bin/docs/debugger.txt | 90 +++++++++---------- bin/resources/shaders/opengl/cas.glsl | 4 +- bin/resources/shaders/opengl/interlace.glsl | 4 +- bin/resources/shaders/opengl/tfx_fs.glsl | 2 +- bin/resources/shaders/vulkan/cas.glsl | 4 +- bin/resources/shaders/vulkan/convert.glsl | 6 +- bin/resources/shaders/vulkan/interlace.glsl | 2 +- bin/resources/shaders/vulkan/present.glsl | 4 +- bin/resources/shaders/vulkan/tfx.glsl | 2 +- bin/shaders/GS.fx | 32 +++---- bin/shaders/GS_FX_Settings.ini | 4 +- common/vsprops/preBuild.cmd | 2 +- common/vsprops/readme.txt | 7 +- linux_various/PCSX2-linux.sh | 2 +- linux_various/check_po_quality.pl | 2 +- linux_various/hex2h.pl | 2 +- pcsx2-gsrunner/test_check_dumps.py | 4 +- .../svg/checkbox-multiple-blank-line.svg | 2 +- .../resources/icons/black/svg/filter-line.svg | 2 +- pcsx2-qt/resources/icons/white/index.theme | 2 +- .../icons/white/svg/arrow-left-right-line.svg | 2 +- .../svg/checkbox-multiple-blank-line.svg | 2 +- .../resources/icons/white/svg/filter-line.svg | 2 +- .../icons/white/svg/flashlight-line.svg | 2 +- .../resources/icons/white/svg/global-line.svg | 2 +- .../resources/icons/white/svg/image-fill.svg | 2 +- .../icons/white/svg/price-tag-3-line.svg | 2 +- pcsx2/Docs/.gitignore | 2 +- pcsx2/Docs/GameIndex.md | 2 +- pcsx2/Docs/License.txt | 1 - pcsx2/Docs/PCSX2_FAQ.md | 2 +- pcsx2/Docs/README.md | 2 +- pcsx2/RDebug/deci2.txt | 28 +++--- pcsx2/RDebug/iloadp.txt | 4 +- pcsx2/Reference/PS2-MemoryCardFileSystem.htm | 2 +- pcsx2/gui/Resources/Info.plist.in | 2 +- tests/ctest/CMakeLists.txt | 2 +- updater/Windows/updater.rc | 6 +- 42 files changed, 130 insertions(+), 132 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 9c04fe5244..f47201d873 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -28,7 +28,7 @@ The following is a list of *general* style recommendations that will make review * Looking at the project's commit history will help with keeping prefixes consistent overtime, *there is no strictly enforced list*. * Try to keep messages brief and informative - + * Remove unnecessary commits and squash commits together when appropriate. * If you are not familiar with rebasing with git, check out the following resources: * CLI - https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-history diff --git a/.github/workflows/scripts/linux/appimage.sh b/.github/workflows/scripts/linux/appimage.sh index 8dfc4d9a9a..39ab913c59 100755 --- a/.github/workflows/scripts/linux/appimage.sh +++ b/.github/workflows/scripts/linux/appimage.sh @@ -23,7 +23,7 @@ sudo cp /usr/local/bin/patchelf /tmp/squashfs-root/usr/bin/patchelf cd "$GITHUB_WORKSPACE" ninja -C build install cp ./pcsx2/gui/Resources/AppIcon64.png ./squashfs-root/PCSX2.png -cp ./linux_various/PCSX2.desktop.in ./squashfs-root/PCSX2.desktop +cp ./linux_various/PCSX2.desktop.in ./squashfs-root/PCSX2.desktop sed -i -e 's|Categories=@PCSX2_MENU_CATEGORIES@|Categories=Game;Emulator;|g' ./squashfs-root/PCSX2.desktop sed -i -e 's|__GL_THREADED_OPTIMIZATIONS=1|__GL_THREADED_OPTIMIZATIONS=0|g' ./squashfs-root/PCSX2.desktop curl -sSfL "https://github.com/AppImage/AppImageKit/releases/download/continuous/runtime-$APPARCH" -o ./squashfs-root/runtime diff --git a/bin/PCSX2_keys.ini.default b/bin/PCSX2_keys.ini.default index d478349827..ef8a05f83c 100644 --- a/bin/PCSX2_keys.ini.default +++ b/bin/PCSX2_keys.ini.default @@ -9,7 +9,7 @@ # best to completely avoid them at this file. GS uses: # F5 - Deinterlace modes # PAGE_UP - FXAA antialiasing (HW and SW) -# PAGE_DOWN - Cycles through dither modes (HW) +# PAGE_DOWN - Cycles through dither modes (HW) # DELETE - Software Antialiasing (AA1) # HOME - FX shader # INSERT - Hardware mipmapping diff --git a/bin/docs/GPL.html b/bin/docs/GPL.html index eb79356afb..8a099cf12e 100644 --- a/bin/docs/GPL.html +++ b/bin/docs/GPL.html @@ -1,9 +1,9 @@ - + GNU General Public License - GNU Project - Free Software Foundation (FSF) - +

GNU GENERAL PUBLIC LICENSE

Version 3, 29 June 2007

@@ -84,7 +84,7 @@ modification follow.

“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.

- +

“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.

@@ -523,7 +523,7 @@ actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.

- +

If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties @@ -690,4 +690,4 @@ Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.

- \ No newline at end of file + diff --git a/bin/docs/debugger.txt b/bin/docs/debugger.txt index d98d1dbf60..631b5f534d 100644 --- a/bin/docs/debugger.txt +++ b/bin/docs/debugger.txt @@ -2,57 +2,57 @@ †---------------------† Disassembly view: - -†---------------------† - - Ctrl + G Goto - Ctrl + E Edit Breakpoint - Ctrl + D Enable/disable breakpoint - Ctrl + B Add breakpoint - Left Go back one branch level/goto pc - Right Follow branch/position memory view to accessed address - Up Move cursor up one line - Down Move cursor down one line - Page Up Move visible area up one page - Page Down Move visible area down one page - F10 Step over - F11 Step into - Tab Toggle display symbols - Left Click Select line/toggle breakpoint if line is already highlighted - Right Click Open context menu †---------------------† - + + Ctrl + G Goto + Ctrl + E Edit Breakpoint + Ctrl + D Enable/disable breakpoint + Ctrl + B Add breakpoint + Left Go back one branch level/goto pc + Right Follow branch/position memory view to accessed address + Up Move cursor up one line + Down Move cursor down one line + Page Up Move visible area up one page + Page Down Move visible area down one page + F10 Step over + F11 Step into + Tab Toggle display symbols + Left Click Select line/toggle breakpoint if line is already highlighted + Right Click Open context menu + +†---------------------† + Memory View: - -†---------------------† - - Ctrl + G Goto - Ctrl + B Add breakpoint - Left Move cursor back one byte/nibble - Right Move cursor ahead one byte/nibble - Up Move cursor up one line - Down Move cursor down one line - Page Up Move cursor up one page - Page Down Move cursor down one page - 0-9,A-F Overwrite hex nibble - Any Overwrite ansi byte - Left Click Select byte/nibble - Right Click Open context menu - Ctrl+Wheel Zoom memory view - Esc Return to previous goto address - Ctrl+V Paste a hex string into memory †---------------------† - + + Ctrl + G Goto + Ctrl + B Add breakpoint + Left Move cursor back one byte/nibble + Right Move cursor ahead one byte/nibble + Up Move cursor up one line + Down Move cursor down one line + Page Up Move cursor up one page + Page Down Move cursor down one page + 0-9,A-F Overwrite hex nibble + Any Overwrite ansi byte + Left Click Select byte/nibble + Right Click Open context menu + Ctrl+Wheel Zoom memory view + Esc Return to previous goto address + Ctrl+V Paste a hex string into memory + +†---------------------† + Breakpoint List: - + †---------------------† - Up Select previous item - Down Select next item - Delete Remove selected breakpoint - Return Edit selected breakpoint - Space Toggle enable state of selected breakpoint + Up Select previous item + Down Select next item + Delete Remove selected breakpoint + Return Edit selected breakpoint + Space Toggle enable state of selected breakpoint -†---------------------† \ No newline at end of file +†---------------------† diff --git a/bin/resources/shaders/opengl/cas.glsl b/bin/resources/shaders/opengl/cas.glsl index 695c0f59b8..a11af28e0e 100644 --- a/bin/resources/shaders/opengl/cas.glsl +++ b/bin/resources/shaders/opengl/cas.glsl @@ -21,14 +21,14 @@ uniform uvec4 const1; uniform ivec2 srcOffset; layout(binding=0) uniform sampler2D imgSrc; -layout(binding=0, rgba8) uniform writeonly image2D imgDst; +layout(binding=0, rgba8) uniform writeonly image2D imgDst; #define A_GPU 1 #define A_GLSL 1 #include "ffx_a.h" -AF3 CasLoad(ASU2 p) +AF3 CasLoad(ASU2 p) { return texelFetch(imgSrc, srcOffset + ivec2(p), 0).rgb; } diff --git a/bin/resources/shaders/opengl/interlace.glsl b/bin/resources/shaders/opengl/interlace.glsl index 5895ddbcdd..1aca117952 100644 --- a/bin/resources/shaders/opengl/interlace.glsl +++ b/bin/resources/shaders/opengl/interlace.glsl @@ -49,7 +49,7 @@ void ps_main3() { // We take half the lines from the current frame and stores them in the MAD frame buffer. // the MAD frame buffer is split in 2 consecutive banks of 2 fields each, the fields in each bank - // are interleaved (top field at even lines and bottom field at odd lines). + // are interleaved (top field at even lines and bottom field at odd lines). // When the source texture has an odd vres, the first line of bank 1 would be an odd index // causing the wrong lines to be discarded, so a vertical offset (lofs) is added to the vertical // position of the destination texture to force the proper field alignment @@ -154,7 +154,7 @@ void ps_main4() // selecting deinterlacing output - + if ((vpos & 1) == field) { // output coordinate present on current field diff --git a/bin/resources/shaders/opengl/tfx_fs.glsl b/bin/resources/shaders/opengl/tfx_fs.glsl index b42019dc7a..3d0eb7806d 100644 --- a/bin/resources/shaders/opengl/tfx_fs.glsl +++ b/bin/resources/shaders/opengl/tfx_fs.glsl @@ -955,7 +955,7 @@ void ps_main() #if PS_ZCLAMP gl_FragDepth = min(gl_FragCoord.z, MaxDepthPS); -#endif +#endif } #endif diff --git a/bin/resources/shaders/vulkan/cas.glsl b/bin/resources/shaders/vulkan/cas.glsl index 0e9bdcc98a..4099852998 100644 --- a/bin/resources/shaders/vulkan/cas.glsl +++ b/bin/resources/shaders/vulkan/cas.glsl @@ -27,7 +27,7 @@ layout(push_constant) uniform const_buffer }; layout(set=0, binding=0) uniform texture2D imgSrc; -layout(set=0, binding=1, rgba8) uniform writeonly image2D imgDst; +layout(set=0, binding=1, rgba8) uniform writeonly image2D imgDst; layout(constant_id=0) const int sharpenOnly = 0; #define A_GPU 1 @@ -35,7 +35,7 @@ layout(constant_id=0) const int sharpenOnly = 0; #include "ffx_a.h" -AF3 CasLoad(ASU2 p) +AF3 CasLoad(ASU2 p) { return texelFetch(imgSrc, srcOffset + ivec2(p), 0).rgb; } diff --git a/bin/resources/shaders/vulkan/convert.glsl b/bin/resources/shaders/vulkan/convert.glsl index 8dc471c6ca..0201ace709 100644 --- a/bin/resources/shaders/vulkan/convert.glsl +++ b/bin/resources/shaders/vulkan/convert.glsl @@ -52,7 +52,7 @@ void ps_depth_copy() void ps_filter_transparency() { vec4 c = sample_c(v_tex); - + c.a = dot(c.rgb, vec3(0.299, 0.587, 0.114)); o_col0 = c; @@ -339,7 +339,7 @@ void ps_yuv() void main() { o_col0 = vec4(0x7FFFFFFF); - + #ifdef ps_stencil_image_init_0 if((127.5f / 255.0f) < sample_c(v_tex).a) // < 0x80 pass (== 0x80 should not pass) o_col0 = vec4(-1); @@ -351,4 +351,4 @@ void main() } #endif -#endif \ No newline at end of file +#endif diff --git a/bin/resources/shaders/vulkan/interlace.glsl b/bin/resources/shaders/vulkan/interlace.glsl index 0467f488f3..cee958d4c4 100644 --- a/bin/resources/shaders/vulkan/interlace.glsl +++ b/bin/resources/shaders/vulkan/interlace.glsl @@ -71,7 +71,7 @@ void ps_main3() { // We take half the lines from the current frame and stores them in the MAD frame buffer. // the MAD frame buffer is split in 2 consecutive banks of 2 fields each, the fields in each bank - // are interleaved (top field at even lines and bottom field at odd lines). + // are interleaved (top field at even lines and bottom field at odd lines). // When the source texture has an odd vres, the first line of bank 1 would be an odd index // causing the wrong lines to be discarded, so a vertical offset (lofs) is added to the vertical // position of the destination texture to force the proper field alignment diff --git a/bin/resources/shaders/vulkan/present.glsl b/bin/resources/shaders/vulkan/present.glsl index 74df27d7ad..2f4687b7c8 100644 --- a/bin/resources/shaders/vulkan/present.glsl +++ b/bin/resources/shaders/vulkan/present.glsl @@ -99,7 +99,7 @@ void ps_filter_complex() // triangular { const float PI = 3.14159265359f; vec2 texdim = vec2(textureSize(samp0, 0)); - + o_col0 = (0.9 - 0.4 * cos(2 * PI * v_tex.y * texdim.y)) * sample_c(vec2(v_tex.x, (floor(v_tex.y * texdim.y) + 0.5) / texdim.y)); } #endif @@ -360,4 +360,4 @@ void ps_filter_lottes() #endif -#endif \ No newline at end of file +#endif diff --git a/bin/resources/shaders/vulkan/tfx.glsl b/bin/resources/shaders/vulkan/tfx.glsl index 381ee2f6f0..347805891c 100644 --- a/bin/resources/shaders/vulkan/tfx.glsl +++ b/bin/resources/shaders/vulkan/tfx.glsl @@ -97,7 +97,7 @@ layout(location = 0) in VSOutput vec4 c; #else flat vec4 c; - #endif + #endif } gsIn[]; layout(location = 0) out GSOutput diff --git a/bin/shaders/GS.fx b/bin/shaders/GS.fx index b8a8daf922..4bc82745e0 100644 --- a/bin/shaders/GS.fx +++ b/bin/shaders/GS.fx @@ -290,7 +290,7 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS #define lumaNW luma4B.w #define lumaN luma4B.z #define lumaW luma4B.x - + #else float4 rgbyM = FxaaTexTop(tex, posM); rgbyM.w = AvgLuminance(rgbyM.xyz); @@ -736,7 +736,7 @@ float4 BiLinearPass(float4 color, float2 texcoord) #if BICUBIC_FILTERING == 1 float4 BicubicFilter(SamplerState texSample, float2 texcoord) -{ +{ float texelSizeX = pixelSize.x; float texelSizeY = pixelSize.y; @@ -789,7 +789,7 @@ float4 GaussianPass(float4 color, float2 texcoord) pixelSize.x /= 2.0; pixelSize.y /= 2.0; } - + float2 dx = float2(pixelSize.x * GaussianSpread, 0.0); float2 dy = float2(0.0, pixelSize.y * GaussianSpread); @@ -1067,7 +1067,7 @@ float4 TexSharpenPass(float4 color, float2 texcoord) float4 VibrancePass(float4 color, float2 texcoord) { float vib = Vibrance; - + #if GLSL == 1 float3 luma = float3(AvgLuminance(color.rgb)); #else @@ -1304,7 +1304,7 @@ float3 TmCurve(float3 color) float4 TonemapPass(float4 color, float2 texcoord) { float3 tonemap = color.rgb; - + float blackLevel = length(tonemap); tonemap = ScaleLuminance(tonemap); @@ -1647,7 +1647,7 @@ float3 CelColor(in float3 RGB) } float4 CelPass(float4 color, float2 uv0) -{ +{ float3 yuv; float3 sum = color.rgb; @@ -1681,11 +1681,11 @@ float4 CelPass(float4 color, float2 uv0) lum[i] = AvgLuminance(col[i].xyz); yuv = RGBtoYUV(col[i]); - + #if UseYuvLuma == 1 yuv.r = round(yuv.r * thresholds.r) / thresholds.r; #endif - + yuv = YUVtoRGB(yuv); sum += yuv; } @@ -1974,7 +1974,7 @@ float4 TemperaturePass(float4 color, float2 texcoord) float4 ScanlinesPass(float4 color, float2 texcoord, float4 fragcoord) { float4 intensity; - + #if GLSL == 1 fragcoord = gl_FragCoord; #endif @@ -2210,7 +2210,7 @@ float3 Tri(float2 pos) float2 Warp(float2 pos) { - pos = pos * 2.0-1.0; + pos = pos * 2.0-1.0; pos *= float2(1.0 + (pos.y*pos.y) * (HorizontalWarp), 1.0 + (pos.x*pos.x) * (VerticalWarp)); return pos * 0.5 + 0.5; } @@ -2233,7 +2233,7 @@ float3 Mask(float2 pos) mask *= lines; return mask; - + #elif MaskingType == 2 // Aperture-grille. pos.x = frac(pos.x/3.0); @@ -2244,7 +2244,7 @@ float3 Mask(float2 pos) else mask.b = MaskAmountLight; return mask; - + #elif MaskingType == 3 // Stretched VGA style shadow mask (same as prior shaders). pos.x += pos.y*3.0; @@ -2256,7 +2256,7 @@ float3 Mask(float2 pos) else mask.b = MaskAmountLight; return mask; - + #else // VGA style shadow mask. pos.xy = floor(pos.xy*float2(1.0, 0.5)); @@ -2352,11 +2352,11 @@ float4 DebandPass(float4 color, float2 texcoord) for(int i=0; i < int(DebandSampleCount); i++) { float4 cn = float4(sample_tex(TextureSampler, texcoord + on[i]).rgb, 1.0); - + #if (DEBAND_SKIP_THRESHOLD_TEST == 0) if(is_within_threshold(col0, cn.rgb)) #endif - + accu += cn; } @@ -2502,7 +2502,7 @@ PS_OUTPUT ps_main(VS_OUTPUT input) #if SCANLINES == 1 color = ScanlinesPass(color, texcoord, position); #endif - + #if SP_DITHERING == 1 color = DitherPass(color, texcoord); #endif diff --git a/bin/shaders/GS_FX_Settings.ini b/bin/shaders/GS_FX_Settings.ini index 8a6afaba07..d022025c56 100644 --- a/bin/shaders/GS_FX_Settings.ini +++ b/bin/shaders/GS_FX_Settings.ini @@ -43,7 +43,7 @@ #define TEXTURE_SHARPEN 0 //# Bicubic Texture Unsharpen Mask. Looks similar to a negative texture LOD bias. Enhances texture fidelity. #define CURVE_CONTRAST 0 //# S-Curve Scene Contrast Enhancement. Locally adjusts contrast using a four-point cubic bezier spline. #define CEL_SHADING 0 //# PX Cel Shading. Simulates the look of animation/toon. Typically best suited for animated style games. -#define PAINT_SHADING 0 //# Paint Shading. Creates the effect of a painted scene. Adapted from ENB series, it's pretty performance heavy. +#define PAINT_SHADING 0 //# Paint Shading. Creates the effect of a painted scene. Adapted from ENB series, it's pretty performance heavy. #define COLOR_TEMPERATURE 0 //# White Point Temperature. Changes the temperature of the image from D65 white point reference. //#[TV EMU TECHNIQUES] [1=ON|0=OFF] #READ: These can all be turned on & off independently of each other. These effects are typically used to simulated older TVs/CRT etc. @@ -108,7 +108,7 @@ #define RedShift 0.50 //[0.10 to 1.00] Red color component shift of the filmic processing. Alters the red balance of the shift. #define GreenShift 0.50 //[0.10 to 1.00] Green color component shift of the filmic processing. Alters the green balance of the shift. #define BlueShift 0.50 //[0.10 to 1.00] Blue color component shift of the filmic processing. Alters the blue balance of the shift. -#define ShiftRatio 0.50 //[0.10 to 2.00] The blending ratio for the base color and the color shift. Higher for a stronger effect. +#define ShiftRatio 0.50 //[0.10 to 2.00] The blending ratio for the base color and the color shift. Higher for a stronger effect. //##[TEXTURE SHARPEN] #define SharpenStrength 0.75 //[0.10 to 2.00] Strength of the texture sharpening effect. This is the maximum strength that will be used. diff --git a/common/vsprops/preBuild.cmd b/common/vsprops/preBuild.cmd index 2914988e63..ac77047640 100644 --- a/common/vsprops/preBuild.cmd +++ b/common/vsprops/preBuild.cmd @@ -6,7 +6,7 @@ :: The git.exe program is part of the msysgit installation. :: :: MsysGit can be downloaded from http://msysgit.github.io/ -:: +:: :: Usage: preBuild.cmd ProjectSrcDir VspropsDir :: :: ProjectSrcDir - $(ProjectDir)\.. - Top-level Directory of project source code. diff --git a/common/vsprops/readme.txt b/common/vsprops/readme.txt index ae1e1b0ed7..520b5f8d42 100644 --- a/common/vsprops/readme.txt +++ b/common/vsprops/readme.txt @@ -5,10 +5,10 @@ Decriptions of Provided .vsprops Sheets * plugin_svnroot - Provides a set of semi-standard user macros for plugins that conform to an expected folder layout. Each user macro can be optionally overridden by the plugin using its own property sheet, if needed. - + See the contents of plugin_svnroot for explanations of the User Macros used by all other properties sheets lested below. - + * 3rdPartyDeps - Adds the /deps folder to the linker search path. Does not add any actual dependencies. You must add those manually. @@ -20,11 +20,10 @@ Decriptions of Provided .vsprops Sheets struct alignment, and other settings required for Pcsx2 and its libs to link in a workable fashion. Adds standard preprocessor defines for: __WIN32__;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE - + * IncrementalLinking - Enables incremental linking, for use in devel/debug modes only. Incremental linking force-disables Whole Program Optimization, but builds the result .exe/.dll much quicker usually. * GlobalLinking - Enables full support for Whole Program Optimization, and force- disables any conflicting incremental link settings. - \ No newline at end of file diff --git a/linux_various/PCSX2-linux.sh b/linux_various/PCSX2-linux.sh index 874a8e6e51..174dad8144 100755 --- a/linux_various/PCSX2-linux.sh +++ b/linux_various/PCSX2-linux.sh @@ -51,7 +51,7 @@ then return 1 # warning exit will kill current terminal fi -# Allow to ship .so library with the build to avoid version issue +# Allow to ship .so library with the build to avoid version issue MY_LD_LIBRARY_PATH=${MY_LD_LIBRARY_PATH:+$MY_LD_LIBRARY_PATH:}$DIR/3rdPartyLibs # openSUSE don't follow FHS !!!! diff --git a/linux_various/check_po_quality.pl b/linux_various/check_po_quality.pl index fbbe5fa701..9d99534cb0 100755 --- a/linux_various/check_po_quality.pl +++ b/linux_various/check_po_quality.pl @@ -75,7 +75,7 @@ sub check_c_format { if ($line =~ /^#:\s*(.*)/) { my $old_index = $index; $index = $1; # help for debug - + if (scalar(@c_symbol) > 0 and not $is_empty) { print "$old_index\n"; print "Error: translation miss some c format\n"; diff --git a/linux_various/hex2h.pl b/linux_various/hex2h.pl index 2ba600b151..2b9fe6ddca 100755 --- a/linux_various/hex2h.pl +++ b/linux_various/hex2h.pl @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License along with PCSX2. # If not, see . -# This basic script convert an jpeg/png image to a .h include file +# This basic script convert an jpeg/png image to a .h include file # compatible with PCSX2 gui use File::Basename; diff --git a/pcsx2-gsrunner/test_check_dumps.py b/pcsx2-gsrunner/test_check_dumps.py index 413b37381c..5ad060b04e 100644 --- a/pcsx2-gsrunner/test_check_dumps.py +++ b/pcsx2-gsrunner/test_check_dumps.py @@ -59,7 +59,7 @@ def check_regression_test(baselinedir, testdir, name): continue framenum = int(matches[1]) - + path1 = os.path.join(dir1, imagename) path2 = os.path.join(dir2, imagename) if not os.path.isfile(path2): @@ -92,7 +92,7 @@ def check_regression_test(baselinedir, testdir, name): def check_regression_tests(baselinedir, testdir): gamedirs = glob.glob(baselinedir + "/*", recursive=False) - + success = 0 failure = 0 diff --git a/pcsx2-qt/resources/icons/black/svg/checkbox-multiple-blank-line.svg b/pcsx2-qt/resources/icons/black/svg/checkbox-multiple-blank-line.svg index 0ca7a11c59..b3c3cbc41c 100644 --- a/pcsx2-qt/resources/icons/black/svg/checkbox-multiple-blank-line.svg +++ b/pcsx2-qt/resources/icons/black/svg/checkbox-multiple-blank-line.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pcsx2-qt/resources/icons/black/svg/filter-line.svg b/pcsx2-qt/resources/icons/black/svg/filter-line.svg index 195394b149..6c9acd0fd6 100644 --- a/pcsx2-qt/resources/icons/black/svg/filter-line.svg +++ b/pcsx2-qt/resources/icons/black/svg/filter-line.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pcsx2-qt/resources/icons/white/index.theme b/pcsx2-qt/resources/icons/white/index.theme index 1db4474307..4a5f76b6c7 100644 --- a/pcsx2-qt/resources/icons/white/index.theme +++ b/pcsx2-qt/resources/icons/white/index.theme @@ -6,4 +6,4 @@ Comment=White Icon Theme Size=64 Type=Scalable MinSize=64 -MaxSize=1024 \ No newline at end of file +MaxSize=1024 diff --git a/pcsx2-qt/resources/icons/white/svg/arrow-left-right-line.svg b/pcsx2-qt/resources/icons/white/svg/arrow-left-right-line.svg index a9f9121b17..b3f6cbaf76 100644 --- a/pcsx2-qt/resources/icons/white/svg/arrow-left-right-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/arrow-left-right-line.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pcsx2-qt/resources/icons/white/svg/checkbox-multiple-blank-line.svg b/pcsx2-qt/resources/icons/white/svg/checkbox-multiple-blank-line.svg index 672c3d0fa0..273464eec7 100644 --- a/pcsx2-qt/resources/icons/white/svg/checkbox-multiple-blank-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/checkbox-multiple-blank-line.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pcsx2-qt/resources/icons/white/svg/filter-line.svg b/pcsx2-qt/resources/icons/white/svg/filter-line.svg index 3953235f60..6b22ced26b 100644 --- a/pcsx2-qt/resources/icons/white/svg/filter-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/filter-line.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pcsx2-qt/resources/icons/white/svg/flashlight-line.svg b/pcsx2-qt/resources/icons/white/svg/flashlight-line.svg index 45924d102e..0887d14a8d 100644 --- a/pcsx2-qt/resources/icons/white/svg/flashlight-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/flashlight-line.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pcsx2-qt/resources/icons/white/svg/global-line.svg b/pcsx2-qt/resources/icons/white/svg/global-line.svg index 030979a502..267679ba7a 100644 --- a/pcsx2-qt/resources/icons/white/svg/global-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/global-line.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pcsx2-qt/resources/icons/white/svg/image-fill.svg b/pcsx2-qt/resources/icons/white/svg/image-fill.svg index ca68e0ef2d..d2b514fd95 100644 --- a/pcsx2-qt/resources/icons/white/svg/image-fill.svg +++ b/pcsx2-qt/resources/icons/white/svg/image-fill.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pcsx2-qt/resources/icons/white/svg/price-tag-3-line.svg b/pcsx2-qt/resources/icons/white/svg/price-tag-3-line.svg index 02ad878cc8..d86e54426e 100644 --- a/pcsx2-qt/resources/icons/white/svg/price-tag-3-line.svg +++ b/pcsx2-qt/resources/icons/white/svg/price-tag-3-line.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pcsx2/Docs/.gitignore b/pcsx2/Docs/.gitignore index f08278d85a..a136337994 100644 --- a/pcsx2/Docs/.gitignore +++ b/pcsx2/Docs/.gitignore @@ -1 +1 @@ -*.pdf \ No newline at end of file +*.pdf diff --git a/pcsx2/Docs/GameIndex.md b/pcsx2/Docs/GameIndex.md index 7005dcf5e5..d8a55618f1 100644 --- a/pcsx2/Docs/GameIndex.md +++ b/pcsx2/Docs/GameIndex.md @@ -141,7 +141,7 @@ The clamp modes are also numerically based. ### GS Hardware General Fixes * conservativeFramebuffer - [`0` or `1`] + [`0` or `1`] {Off or On} Default: On (`1`) * texturePreloading diff --git a/pcsx2/Docs/License.txt b/pcsx2/Docs/License.txt index 74e85cb3ca..94d4a2db76 100644 --- a/pcsx2/Docs/License.txt +++ b/pcsx2/Docs/License.txt @@ -17,4 +17,3 @@ * You should have received a copy of the GNU General Public License along with PCSX2. * If not, see . */ - \ No newline at end of file diff --git a/pcsx2/Docs/PCSX2_FAQ.md b/pcsx2/Docs/PCSX2_FAQ.md index b4ed08cef9..f888c0e8dd 100644 --- a/pcsx2/Docs/PCSX2_FAQ.md +++ b/pcsx2/Docs/PCSX2_FAQ.md @@ -198,4 +198,4 @@ For Linux users, PCSX2 will automatically detect and bind controls to any recogn * [The original guide, outdated](https://forums.pcsx2.net/Thread-How-pnach-files-work). ### PCSX2 with Netplay Support -* [The latest Netplay fork of PCSX2](https://forums.pcsx2.net/Thread-PCSX2-Online-Plus). \ No newline at end of file +* [The latest Netplay fork of PCSX2](https://forums.pcsx2.net/Thread-PCSX2-Online-Plus). diff --git a/pcsx2/Docs/README.md b/pcsx2/Docs/README.md index f34196adf6..b2b4689c57 100644 --- a/pcsx2/Docs/README.md +++ b/pcsx2/Docs/README.md @@ -22,4 +22,4 @@ We thank everybody for their contributions to the project, but we would like to - noigeaR - xTVaser - - And 1 anonymous donator! \ No newline at end of file + - And 1 anonymous donator! diff --git a/pcsx2/RDebug/deci2.txt b/pcsx2/RDebug/deci2.txt index 61f52c6a09..ea0a0c1b4e 100644 --- a/pcsx2/RDebug/deci2.txt +++ b/pcsx2/RDebug/deci2.txt @@ -1,18 +1,18 @@ pcsx2 log->debugger tty mapping -Ŀ -Bios EE 0 IOP Bios -CPU & MMI & COP0 & FPU EE 1 IOP IOP cpu -VU0 & VUMicro EE 2 IOP HW -VIF EE 3 IOP GTE -GIF EE 4 IOP GPU -DMA EE 5 IOP DMA -HW & Unknown Memory EE 6 IOP Unknown Memory -ELF & Scratch pad EE 7 IOP PAD -IPU EE 8 IOP CDR -SIF & RPC services EE 9 IOP - -SysMessage EEKernelIOP SysMessage - +�������������������������������������������������������Ŀ +Bios �EE� 0 �IOP� Bios � +CPU & MMI & COP0 & FPU �EE� 1 �IOP� IOP cpu � +VU0 & VUMicro �EE� 2 �IOP� HW � +VIF �EE� 3 �IOP� GTE � +GIF �EE� 4 �IOP� GPU � +DMA �EE� 5 �IOP� DMA � +HW & Unknown Memory �EE� 6 �IOP� Unknown Memory � +ELF & Scratch pad �EE� 7 �IOP� PAD � +IPU �EE� 8 �IOP� CDR � +SIF & RPC services �EE� 9 �IOP� � + � � � � � +SysMessage �EE�Kernel�IOP� SysMessage � +��������������������������������������������������������� PRODG: 230,130, 120,121,122,110-119,11F,210-219,21F,410 CW: 230,130,150,120,121, 210-219,21F,110-119,11F diff --git a/pcsx2/RDebug/iloadp.txt b/pcsx2/RDebug/iloadp.txt index 9bb751f8e6..32ae15b37a 100644 --- a/pcsx2/RDebug/iloadp.txt +++ b/pcsx2/RDebug/iloadp.txt @@ -1,6 +1,6 @@ ILOADP_MODULE_INFO{ - u16 flags Ŀ <Ŀ - u16 version < + u16 flags ���Ŀ <��Ŀ + u16 version <���� ����� u32 addr u32 sz_text u32 sz_data diff --git a/pcsx2/Reference/PS2-MemoryCardFileSystem.htm b/pcsx2/Reference/PS2-MemoryCardFileSystem.htm index 5a2d9129e2..290f8ea7bf 100644 --- a/pcsx2/Reference/PS2-MemoryCardFileSystem.htm +++ b/pcsx2/Reference/PS2-MemoryCardFileSystem.htm @@ -880,4 +880,4 @@ Hanimar: