Merge pull request #197 from Xphalnos/main

More screenshots for README
This commit is contained in:
georgemoralis 2024-06-14 17:28:56 +03:00 committed by GitHub
commit 6a47f8ae50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 38 additions and 27 deletions

4
.gitmodules vendored
View File

@ -51,10 +51,10 @@
url = https://github.com/zyantific/zydis.git url = https://github.com/zyantific/zydis.git
[submodule "externals/sirit"] [submodule "externals/sirit"]
path = externals/sirit path = externals/sirit
url = https://github.com/raphaelthegreat/sirit url = https://github.com/raphaelthegreat/sirit.git
[submodule "externals/xxhash"] [submodule "externals/xxhash"]
path = externals/xxhash path = externals/xxhash
url = https://github.com/Cyan4973/xxHash.git url = https://github.com/Cyan4973/xxHash.git
[submodule "externals/tracy"] [submodule "externals/tracy"]
path = externals/tracy path = externals/tracy
url = https://github.com/shadps4-emu/tracy url = https://github.com/shadps4-emu/tracy.git

View File

@ -3,17 +3,27 @@ Comment: It is best to use this file to record copyright information about
generated, binary and third party files generated, binary and third party files
Files: CMakeSettings.json Files: CMakeSettings.json
scripts/ps4_names.txt
documents/changelog.txt
documents/readme.txt
documents/Screenshots/screenshot.png
.github/shadps4.desktop .github/shadps4.desktop
.github/shadps4.png .github/shadps4.png
.gitmodules .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/controller_icon.png
src/images/exit_icon.png src/images/exit_icon.png
src/images/file_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/folder_icon.png
src/images/grid_icon.png src/images/grid_icon.png
src/images/iconsize_icon.png src/images/iconsize_icon.png
@ -24,16 +34,9 @@ Files: CMakeSettings.json
src/images/refresh_icon.png src/images/refresh_icon.png
src/images/settings_icon.png src/images/settings_icon.png
src/images/stop_icon.png src/images/stop_icon.png
src/images/shadps4.ico
src/images/themes_icon.png 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 src/shadps4.qrc
externals/stb_image.h src/shadps4.rc
externals/tracy/*
Copyright: shadPS4 Emulator Project Copyright: shadPS4 Emulator Project
License: GPL-2.0-or-later License: GPL-2.0-or-later

View File

@ -10,7 +10,7 @@ if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release) set(CMAKE_BUILD_TYPE Release)
endif() 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) option(ENABLE_QT_GUI "Enable the Qt GUI. If not selected then the emulator uses a minimal SDL-based UI instead" OFF)

View File

@ -27,10 +27,18 @@ SPDX-License-Identifier: GPL-2.0-or-later
<a href="https://github.com/shadps4-emu/shadPS4/stargazers"> <a href="https://github.com/shadps4-emu/shadPS4/stargazers">
<img src="https://img.shields.io/github/stars/shadps4-emu/shadPS4" width="120"> <img src="https://img.shields.io/github/stars/shadps4-emu/shadPS4" width="120">
<h1 align="center"> <p align="center">
<br> <a href="https://shadps4.net/">
<a href="https://shadps4.net/"><img src="https://github.com/shadps4-emu/shadPS4/blob/main/documents/Screenshots/screenshot.png" width="550"></a> <img src="https://github.com/shadps4-emu/shadPS4/blob/main/documents/Screenshots/Sonic Mania.png" width="500">
<br>
<a href="https://shadps4.net/">
<img src="https://github.com/shadps4-emu/shadPS4/blob/main/documents/Screenshots/screenshot.png" width="500">
<a href="https://shadps4.net/">
<img src="https://github.com/shadps4-emu/shadPS4/blob/main/documents/Screenshots/Undertale.png" width="500">
<a href="https://shadps4.net/">
<img src="https://github.com/shadps4-emu/shadPS4/blob/main/documents/Screenshots/We are DOOMED.png" width="500">
# shadPS4 # shadPS4

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 KiB

2
externals/glslang vendored

@ -1 +1 @@
Subproject commit 73eccd4b67985d344578cade8958214cee0a3f6e Subproject commit a92c61f8456fa9731c0b000a2c6fc52a740c2be7

2
externals/toml11 vendored

@ -1 +1 @@
Subproject commit 85faca9cbe8d76324ff38c1801be44c63e12d5be Subproject commit b389bbc4ebf90fa2fe7651de3046fb19f661ba3c

@ -1 +1 @@
Subproject commit d192041a2fc9c9fd8ae67d8ae3f32c5511541f04 Subproject commit 05fe2cc910a68c9ba5dac07db46ef78573acee72

2
externals/xbyak vendored

@ -1 +1 @@
Subproject commit 80477f635345e8f13efc512d84b01b94cad92cd9 Subproject commit aabb091ae37068498751fd58202a9854408ecb0e

2
externals/xxhash vendored

@ -1 +1 @@
Subproject commit ac3a25da3d957d9ef3e4114d9f8332d34ce83a46 Subproject commit b0adcc54188c3130b1793e7b19c62eb1e669f7df

2
externals/zydis vendored

@ -1 +1 @@
Subproject commit fd3e9a6cc8bdcc617b531feda186699e51664f76 Subproject commit 5a68f639e4f01604cc7bfc8d313f583a8137e3d3