Merge remote-tracking branch 'origin/master' into magicgate

# Conflicts: # pcsx2/VMManager.cpp
DiscoStarslayer · Nov 13, 2023 · 8f8fa1d · 8f8fa1d
2 parents 5c28e4a + 46527ca
commit 8f8fa1d
Show file tree

Hide file tree

Showing 43 changed files with 1,195 additions and 1,304 deletions.
diff --git a/.github/ISSUE_TEMPLATE/app_bug_report.yaml b/.github/ISSUE_TEMPLATE/app_bug_report.yaml
@@ -18,6 +18,8 @@ body:
 
         Please make an effort to make sure your issue isn't already reported.
 
+        Do not create issues involving software piracy of BIOS or ISO files, our rules specifically prohibit this and your issue will be closed.
+
         ### Please Avoid Issues Pertaining to the Following:
         - We are **not** accepting bug reports for **PSX mode** at this time.
           - If you are interested in helping contribute to PSX mode please do so on the forums. Otherwise our recommendation is that you use  [Duckstation](https://github.com/stenzek/duckstation/releases/tag/latest).

diff --git a/.github/ISSUE_TEMPLATE/emu_bug_report.yaml b/.github/ISSUE_TEMPLATE/emu_bug_report.yaml
@@ -18,6 +18,8 @@ body:
 
         Please make an effort to make sure your issue isn't already reported.
 
+        Do not create issues involving software piracy of BIOS or ISO files, our rules specifically prohibit this and your issue will be closed.
+
         ### Please Avoid Issues Pertaining to the Following:
         - We are **not** accepting bug reports for **PSX mode** at this time.
           - If you are interested in helping contribute to PSX mode please do so on the forums. Otherwise our recommendation is that you use  [Duckstation](https://github.com/stenzek/duckstation/releases/tag/latest).

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -6,6 +6,15 @@ labels: ["Enhancement / Feature Request"]
 # assignees:
 #   - octocat
 body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Important: Read First
+
+        Please make an effort to make sure your issue isn't already reported.
+
+        Do not create issues involving software piracy of BIOS or ISO files, our rules specifically prohibit this and your issue will be closed.
+
   - type: textarea
     id: desc
     attributes:

diff --git a/3rdparty/rcheevos/CMakeLists.txt b/3rdparty/rcheevos/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_library(rcheevos
+	rcheevos/include/rcheevos.h
 	rcheevos/include/rc_api_editor.h
 	rcheevos/include/rc_api_info.h
 	rcheevos/include/rc_api_request.h
@@ -8,7 +9,6 @@ add_library(rcheevos
 	rcheevos/include/rc_consoles.h
 	rcheevos/include/rc_error.h
 	rcheevos/include/rc_hash.h
-	rcheevos/include/rcheevos.h
 	rcheevos/include/rc_runtime.h
 	rcheevos/include/rc_runtime_types.h
 	rcheevos/include/rc_url.h
@@ -19,17 +19,13 @@ add_library(rcheevos
 	rcheevos/src/rapi/rc_api_runtime.c
 	rcheevos/src/rapi/rc_api_user.c
 	rcheevos/src/rcheevos/alloc.c
-	rcheevos/src/rcheevos/compat.c
 	rcheevos/src/rcheevos/condition.c
 	rcheevos/src/rcheevos/condset.c
 	rcheevos/src/rcheevos/consoleinfo.c
 	rcheevos/src/rcheevos/format.c
 	rcheevos/src/rcheevos/lboard.c
 	rcheevos/src/rcheevos/memref.c
 	rcheevos/src/rcheevos/operand.c
-	rcheevos/src/rcheevos/rc_client.c
-	rcheevos/src/rcheevos/rc_client_internal.h
-	rcheevos/src/rcheevos/rc_compat.h
 	rcheevos/src/rcheevos/rc_internal.h
 	rcheevos/src/rcheevos/rc_validate.c
 	rcheevos/src/rcheevos/rc_validate.h
@@ -38,6 +34,14 @@ add_library(rcheevos
 	rcheevos/src/rcheevos/runtime_progress.c
 	rcheevos/src/rcheevos/trigger.c
 	rcheevos/src/rcheevos/value.c
+	rcheevos/src/rc_client.c
+	rcheevos/src/rc_client_internal.h
+	rcheevos/src/rc_compat.c
+	rcheevos/src/rc_compat.h
+	rcheevos/src/rc_util.c
+	rcheevos/src/rc_util.h
+	rcheevos/src/rc_version.h
+	rcheevos/src/rhash/cdreader.c
 	rcheevos/src/rhash/hash.c
 	rcheevos/src/rhash/md5.c
 	rcheevos/src/rhash/md5.h

diff --git a/3rdparty/rcheevos/rcheevos b/3rdparty/rcheevos/rcheevos
diff --git a/3rdparty/rcheevos/rcheevos.vcxproj b/3rdparty/rcheevos/rcheevos.vcxproj
@@ -36,21 +36,22 @@
     <ClCompile Include="rcheevos\src\rapi\rc_api_runtime.c" />
     <ClCompile Include="rcheevos\src\rapi\rc_api_user.c" />
     <ClCompile Include="rcheevos\src\rcheevos\alloc.c" />
-    <ClCompile Include="rcheevos\src\rcheevos\compat.c" />
     <ClCompile Include="rcheevos\src\rcheevos\condition.c" />
     <ClCompile Include="rcheevos\src\rcheevos\condset.c" />
     <ClCompile Include="rcheevos\src\rcheevos\consoleinfo.c" />
     <ClCompile Include="rcheevos\src\rcheevos\format.c" />
     <ClCompile Include="rcheevos\src\rcheevos\lboard.c" />
     <ClCompile Include="rcheevos\src\rcheevos\memref.c" />
     <ClCompile Include="rcheevos\src\rcheevos\operand.c" />
-    <ClCompile Include="rcheevos\src\rcheevos\rc_client.c" />
     <ClCompile Include="rcheevos\src\rcheevos\rc_validate.c" />
     <ClCompile Include="rcheevos\src\rcheevos\richpresence.c" />
     <ClCompile Include="rcheevos\src\rcheevos\runtime.c" />
     <ClCompile Include="rcheevos\src\rcheevos\runtime_progress.c" />
     <ClCompile Include="rcheevos\src\rcheevos\trigger.c" />
     <ClCompile Include="rcheevos\src\rcheevos\value.c" />
+    <ClCompile Include="rcheevos\src\rc_client.c" />
+    <ClCompile Include="rcheevos\src\rc_compat.c" />
+    <ClCompile Include="rcheevos\src\rc_util.c" />
     <ClCompile Include="rcheevos\src\rhash\hash.c" />
     <ClCompile Include="rcheevos\src\rhash\md5.c" />
     <ClCompile Include="rcheevos\src\rurl\url.c" />
@@ -70,10 +71,12 @@
     <ClInclude Include="rcheevos\include\rc_runtime_types.h" />
     <ClInclude Include="rcheevos\include\rc_url.h" />
     <ClInclude Include="rcheevos\src\rapi\rc_api_common.h" />
-    <ClInclude Include="rcheevos\src\rcheevos\rc_client_internal.h" />
-    <ClInclude Include="rcheevos\src\rcheevos\rc_compat.h" />
     <ClInclude Include="rcheevos\src\rcheevos\rc_internal.h" />
     <ClInclude Include="rcheevos\src\rcheevos\rc_validate.h" />
+    <ClInclude Include="rcheevos\src\rc_client_internal.h" />
+    <ClInclude Include="rcheevos\src\rc_compat.h" />
+    <ClInclude Include="rcheevos\src\rc_util.h" />
+    <ClInclude Include="rcheevos\src\rc_version.h" />
     <ClInclude Include="rcheevos\src\rhash\md5.h" />
   </ItemGroup>
   <ItemDefinitionGroup>

diff --git a/3rdparty/rcheevos/rcheevos.vcxproj.filters b/3rdparty/rcheevos/rcheevos.vcxproj.filters
@@ -33,21 +33,18 @@
     <ClCompile Include="rcheevos\src\rapi\rc_api_common.c">
       <Filter>rapi</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\format.c">
-      <Filter>rcheevos</Filter>
-    </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\lboard.c">
-      <Filter>rcheevos</Filter>
-    </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\memref.c">
-      <Filter>rcheevos</Filter>
+    <ClCompile Include="rcheevos\src\rhash\hash.c">
+      <Filter>rhash</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\operand.c">
-      <Filter>rcheevos</Filter>
+    <ClCompile Include="rcheevos\src\rhash\md5.c">
+      <Filter>rhash</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\rc_validate.c">
-      <Filter>rcheevos</Filter>
+    <ClCompile Include="rcheevos\src\rurl\url.c">
+      <Filter>rurl</Filter>
     </ClCompile>
+    <ClCompile Include="rcheevos\src\rc_client.c" />
+    <ClCompile Include="rcheevos\src\rc_compat.c" />
+    <ClCompile Include="rcheevos\src\rc_util.c" />
     <ClCompile Include="rcheevos\src\rcheevos\richpresence.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
@@ -66,9 +63,6 @@
     <ClCompile Include="rcheevos\src\rcheevos\alloc.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\compat.c">
-      <Filter>rcheevos</Filter>
-    </ClCompile>
     <ClCompile Include="rcheevos\src\rcheevos\condition.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
@@ -78,32 +72,26 @@
     <ClCompile Include="rcheevos\src\rcheevos\consoleinfo.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rhash\hash.c">
-      <Filter>rhash</Filter>
+    <ClCompile Include="rcheevos\src\rcheevos\format.c">
+      <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rhash\md5.c">
-      <Filter>rhash</Filter>
+    <ClCompile Include="rcheevos\src\rcheevos\lboard.c">
+      <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rurl\url.c">
-      <Filter>rurl</Filter>
+    <ClCompile Include="rcheevos\src\rcheevos\memref.c">
+      <Filter>rcheevos</Filter>
+    </ClCompile>
+    <ClCompile Include="rcheevos\src\rcheevos\operand.c">
+      <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\rc_client.c">
+    <ClCompile Include="rcheevos\src\rcheevos\rc_validate.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="rcheevos\src\rapi\rc_api_common.h">
       <Filter>rapi</Filter>
     </ClInclude>
-    <ClInclude Include="rcheevos\src\rcheevos\rc_compat.h">
-      <Filter>rcheevos</Filter>
-    </ClInclude>
-    <ClInclude Include="rcheevos\src\rcheevos\rc_internal.h">
-      <Filter>rcheevos</Filter>
-    </ClInclude>
-    <ClInclude Include="rcheevos\src\rcheevos\rc_validate.h">
-      <Filter>rcheevos</Filter>
-    </ClInclude>
     <ClInclude Include="rcheevos\src\rhash\md5.h">
       <Filter>rhash</Filter>
     </ClInclude>
@@ -146,7 +134,14 @@
     <ClInclude Include="rcheevos\include\rc_client.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="rcheevos\src\rcheevos\rc_client_internal.h">
+    <ClInclude Include="rcheevos\src\rc_client_internal.h" />
+    <ClInclude Include="rcheevos\src\rc_compat.h" />
+    <ClInclude Include="rcheevos\src\rc_util.h" />
+    <ClInclude Include="rcheevos\src\rc_version.h" />
+    <ClInclude Include="rcheevos\src\rcheevos\rc_validate.h">
+      <Filter>rcheevos</Filter>
+    </ClInclude>
+    <ClInclude Include="rcheevos\src\rcheevos\rc_internal.h">
       <Filter>rcheevos</Filter>
     </ClInclude>
   </ItemGroup>
+15 −0		CHANGELOG.md
+9 −244		README.md
+0 −1		_config.yml
+22 −20		include/rc_api_editor.h
+23 −22		include/rc_api_info.h
+10 −28		include/rc_api_request.h
+30 −29		include/rc_api_runtime.h
+12 −11		include/rc_api_user.h
+3 −2		include/rc_client.h
+8 −6		include/rc_consoles.h
+4 −1		include/rc_error.h
+34 −33		include/rc_runtime.h
+45 −42		include/rc_runtime_types.h
+116 −172		src/rapi/rc_api_common.c
+16 −25		src/rapi/rc_api_common.h
+16 −16		src/rapi/rc_api_editor.c
+13 −13		src/rapi/rc_api_info.c
+22 −20		src/rapi/rc_api_runtime.c
+18 −17		src/rapi/rc_api_user.c
+303 −144		src/rc_client.c
+62 −22		src/rc_client_internal.h
+0 −0		src/rc_compat.c
+0 −0		src/rc_compat.h
+65 −62		src/rc_libretro.c
+17 −14		src/rc_libretro.h
+188 −0		src/rc_util.c
+53 −0		src/rc_util.h
+2 −2		src/rc_version.h
+17 −66		src/rcheevos/alloc.c
+10 −10		src/rcheevos/condition.c
+2 −2		src/rcheevos/condset.c
+1 −1		src/rcheevos/consoleinfo.c
+9 −9		src/rcheevos/format.c
+4 −1		src/rcheevos/lboard.c
+27 −27		src/rcheevos/memref.c
+11 −11		src/rcheevos/operand.c
+33 −35		src/rcheevos/rc_internal.h
+25 −24		src/rcheevos/rc_validate.c
+6 −6		src/rcheevos/rc_validate.h
+10 −10		src/rcheevos/richpresence.c
+33 −33		src/rcheevos/runtime.c
+45 −44		src/rcheevos/runtime_progress.c
+4 −1		src/rcheevos/trigger.c
+3 −3		src/rcheevos/value.c
+4 −4		src/rhash/cdreader.c
+26 −25		src/rhash/hash.c
+1 −1		src/rurl/url.c
+28 −23		test/Makefile
+25 −25		test/rapi/test_rc_api_common.c
+1 −1		test/rapi/test_rc_api_editor.c
+1 −1		test/rapi/test_rc_api_info.c
+133 −11		test/rapi/test_rc_api_user.c
+11 −9		test/rcheevos-test.vcxproj
+36 −30		test/rcheevos-test.vcxproj.filters
+4 −4		test/rcheevos/mock_memory.h
+18 −18		test/rcheevos/test_condition.c
+95 −95		test/rcheevos/test_condset.c
+4 −4		test/rcheevos/test_consoleinfo.c
+15 −15		test/rcheevos/test_lboard.c
+6 −6		test/rcheevos/test_memref.c
+11 −11		test/rcheevos/test_operand.c
+4 −4		test/rcheevos/test_rc_validate.c
+55 −55		test/rcheevos/test_richpresence.c
+37 −37		test/rcheevos/test_runtime.c
+80 −80		test/rcheevos/test_runtime_progress.c
+2 −2		test/rcheevos/test_timing.c
+41 −41		test/rcheevos/test_trigger.c
+14 −14		test/rcheevos/test_value.c
+16 −16		test/rhash/data.c
+9 −9		test/rhash/data.h
+1 −1		test/rhash/mock_filereader.c
+10 −10		test/rhash/test_cdreader.c
+3 −3		test/rhash/test_hash.c
+1 −1		test/rurl/test_url.c
+1 −1		test/test.c
+6 −5		test/test_framework.h
+444 −279		test/test_rc_client.c
+27 −27		test/test_rc_libretro.c
+11 −8		validator/Makefile
+1 −1		validator/validator.c
+2 −1		validator/validator.vcxproj
+6 −3		validator/validator.vcxproj.filters