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 @@
- +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 +