From 7fe5f12f29f3d449f5a254ea2cd369bd742bc863 Mon Sep 17 00:00:00 2001 From: Xphalnos <164882787+Xphalnos@users.noreply.github.com> Date: Sun, 23 Jun 2024 08:57:32 +0200 Subject: [PATCH] Screenshots fix --- .github/workflows/windows-qt.yml | 4 ++-- .github/workflows/windows.yml | 1 + .gitmodules | 2 +- README.md | 26 +++++++++----------------- externals/glslang | 2 +- externals/vulkan-headers | 2 +- externals/xxhash | 2 +- src/qt_gui/game_list_frame.cpp | 1 - 8 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.github/workflows/windows-qt.yml b/.github/workflows/windows-qt.yml index 7cad4630..7d302448 100644 --- a/.github/workflows/windows-qt.yml +++ b/.github/workflows/windows-qt.yml @@ -29,13 +29,13 @@ jobs: uses: jurplel/install-qt-action@v4 with: arch: win64_msvc2019_64 - version: 6.7.1 + version: 6.7.2 - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -T ClangCL -DENABLE_QT_GUI=ON - + - name: Build # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c23e41a6..4616fc5b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,6 +23,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive + - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type diff --git a/.gitmodules b/.gitmodules index 4a8ac3b8..d6965722 100644 --- a/.gitmodules +++ b/.gitmodules @@ -51,7 +51,7 @@ url = https://github.com/zyantific/zydis.git [submodule "externals/sirit"] path = externals/sirit - url = https://github.com/shadps4-emu/sirit + url = https://github.com/shadps4-emu/sirit.git [submodule "externals/xxhash"] path = externals/xxhash url = https://github.com/Cyan4973/xxHash.git diff --git a/README.md b/README.md index 4e5cd02c..eaf24cbd 100644 --- a/README.md +++ b/README.md @@ -9,36 +9,28 @@ SPDX-License-Identifier: GPL-2.0-or-later
shadPS4
+ -

- +

- - - - +

- - - - - - - - - - + + + + +

# shadPS4 @@ -50,7 +42,7 @@ Check us on [**X (twitter)**](https://x.com/shadps4) or on our [**website**](htt # Status -In development, 2D games are working like [**Sonic Mania**](https://www.youtube.com/watch?v=AAHoNzhHyCU), Undertale, Momodora and others... +In development, small games are working like [**Sonic Mania**](https://www.youtube.com/watch?v=AAHoNzhHyCU), [**Undertale**](https://youtu.be/5zIvdy65Ro4), [**Dysmantle**](https://youtu.be/b9xzhLBdESE) and others... # Why? diff --git a/externals/glslang b/externals/glslang index a92c61f8..2d8b71fc 160000 --- a/externals/glslang +++ b/externals/glslang @@ -1 +1 @@ -Subproject commit a92c61f8456fa9731c0b000a2c6fc52a740c2be7 +Subproject commit 2d8b71fc63578a93726c05e0565c3ef064bdc1ba diff --git a/externals/vulkan-headers b/externals/vulkan-headers index 05fe2cc9..e3c37e6e 160000 --- a/externals/vulkan-headers +++ b/externals/vulkan-headers @@ -1 +1 @@ -Subproject commit 05fe2cc910a68c9ba5dac07db46ef78573acee72 +Subproject commit e3c37e6e184a232e10b01dff5a065ce48c047f88 diff --git a/externals/xxhash b/externals/xxhash index b0adcc54..805c00b6 160000 --- a/externals/xxhash +++ b/externals/xxhash @@ -1 +1 @@ -Subproject commit b0adcc54188c3130b1793e7b19c62eb1e669f7df +Subproject commit 805c00b68fa754200ada0c207ffeaa7a4409377c diff --git a/src/qt_gui/game_list_frame.cpp b/src/qt_gui/game_list_frame.cpp index f0ba113e..5bc00c7f 100644 --- a/src/qt_gui/game_list_frame.cpp +++ b/src/qt_gui/game_list_frame.cpp @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project -// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include "game_list_frame.h"