diff --git a/.gitmodules b/.gitmodules index 3284ecce..14f7520f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -51,10 +51,10 @@ url = https://github.com/zyantific/zydis.git [submodule "externals/sirit"] path = externals/sirit - url = https://github.com/raphaelthegreat/sirit + url = https://github.com/raphaelthegreat/sirit.git [submodule "externals/xxhash"] path = externals/xxhash url = https://github.com/Cyan4973/xxHash.git [submodule "externals/tracy"] path = externals/tracy - url = https://github.com/shadps4-emu/tracy + url = https://github.com/shadps4-emu/tracy.git diff --git a/.reuse/dep5 b/.reuse/dep5 index 9ac78f7a..b5ca5ee8 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -3,17 +3,27 @@ Comment: It is best to use this file to record copyright information about generated, binary and third party files Files: CMakeSettings.json - scripts/ps4_names.txt - documents/changelog.txt - documents/readme.txt - documents/Screenshots/screenshot.png .github/shadps4.desktop .github/shadps4.png .gitmodules - src/images/shadps4.ico + documents/changelog.txt + documents/readme.txt + documents/Screenshots/screenshot.png + documents/Screenshots/Sonic Mania.png + documents/Screenshots/Undertale.png + documents/Screenshots/We are DOOMED.png + externals/stb_image.h + externals/tracy/* + scripts/ps4_names.txt src/images/controller_icon.png src/images/exit_icon.png src/images/file_icon.png + src/images/flag_china.png + src/images/flag_eu.png + src/images/flag_jp.png + src/images/flag_unk.png + src/images/flag_us.png + src/images/flag_world.png src/images/folder_icon.png src/images/grid_icon.png src/images/iconsize_icon.png @@ -24,16 +34,9 @@ Files: CMakeSettings.json src/images/refresh_icon.png src/images/settings_icon.png src/images/stop_icon.png + src/images/shadps4.ico src/images/themes_icon.png - src/images/flag_jp.png - src/images/flag_eu.png - src/images/flag_us.png - src/images/flag_china.png - src/images/flag_world.png - src/images/flag_unk.png - src/shadps4.rc src/shadps4.qrc - externals/stb_image.h - externals/tracy/* + src/shadps4.rc Copyright: shadPS4 Emulator Project License: GPL-2.0-or-later diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ee2dcb3..232e7b47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() -project(shadps4) +project(shadPS4) option(ENABLE_QT_GUI "Enable the Qt GUI. If not selected then the emulator uses a minimal SDL-based UI instead" OFF) diff --git a/README.md b/README.md index c93a3b44..4e5cd02c 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,18 @@ SPDX-License-Identifier: GPL-2.0-or-later -

-
-
-
+

+ + + + + + + + + + + # shadPS4 diff --git a/documents/Screenshots/Sonic Mania.png b/documents/Screenshots/Sonic Mania.png new file mode 100644 index 00000000..38d064f9 Binary files /dev/null and b/documents/Screenshots/Sonic Mania.png differ diff --git a/documents/Screenshots/Undertale.png b/documents/Screenshots/Undertale.png new file mode 100644 index 00000000..c3e7745d Binary files /dev/null and b/documents/Screenshots/Undertale.png differ diff --git a/documents/Screenshots/We are DOOMED.png b/documents/Screenshots/We are DOOMED.png new file mode 100644 index 00000000..757160e5 Binary files /dev/null and b/documents/Screenshots/We are DOOMED.png differ diff --git a/externals/glslang b/externals/glslang index 73eccd4b..a92c61f8 160000 --- a/externals/glslang +++ b/externals/glslang @@ -1 +1 @@ -Subproject commit 73eccd4b67985d344578cade8958214cee0a3f6e +Subproject commit a92c61f8456fa9731c0b000a2c6fc52a740c2be7 diff --git a/externals/toml11 b/externals/toml11 index 85faca9c..b389bbc4 160000 --- a/externals/toml11 +++ b/externals/toml11 @@ -1 +1 @@ -Subproject commit 85faca9cbe8d76324ff38c1801be44c63e12d5be +Subproject commit b389bbc4ebf90fa2fe7651de3046fb19f661ba3c diff --git a/externals/vulkan-headers b/externals/vulkan-headers index d192041a..05fe2cc9 160000 --- a/externals/vulkan-headers +++ b/externals/vulkan-headers @@ -1 +1 @@ -Subproject commit d192041a2fc9c9fd8ae67d8ae3f32c5511541f04 +Subproject commit 05fe2cc910a68c9ba5dac07db46ef78573acee72 diff --git a/externals/xbyak b/externals/xbyak index 80477f63..aabb091a 160000 --- a/externals/xbyak +++ b/externals/xbyak @@ -1 +1 @@ -Subproject commit 80477f635345e8f13efc512d84b01b94cad92cd9 +Subproject commit aabb091ae37068498751fd58202a9854408ecb0e diff --git a/externals/xxhash b/externals/xxhash index ac3a25da..b0adcc54 160000 --- a/externals/xxhash +++ b/externals/xxhash @@ -1 +1 @@ -Subproject commit ac3a25da3d957d9ef3e4114d9f8332d34ce83a46 +Subproject commit b0adcc54188c3130b1793e7b19c62eb1e669f7df diff --git a/externals/zydis b/externals/zydis index fd3e9a6c..5a68f639 160000 --- a/externals/zydis +++ b/externals/zydis @@ -1 +1 @@ -Subproject commit fd3e9a6cc8bdcc617b531feda186699e51664f76 +Subproject commit 5a68f639e4f01604cc7bfc8d313f583a8137e3d3