Merge branch 'release/3.0.2'

Provenance-Emu · Jan 16, 2025 · 5e605ff · 5e605ff
2 parents afd0cba + 9735492
commit 5e605ff
Show file tree

Hide file tree

Showing 24 changed files with 566 additions and 75 deletions.
diff --git a/.gitignore b/.gitignore
@@ -123,3 +123,5 @@ Cores/DuckStation/lib/
 Cores/PPSSPP/lib/
 build
 /PVLookup/Sources/ShiraGame/Resources/shiragame.sqlite3
+
+.sentryclirc
diff --git a/Build.xcconfig b/Build.xcconfig
@@ -1,8 +1,8 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-MARKETING_VERSION = 3.0.1
-CURRENT_PROJECT_VERSION = 2837
+MARKETING_VERSION = 3.0.2
+CURRENT_PROJECT_VERSION = 2838
 
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GLES_SILENCE_DEPRECATION=1  NONJAILBROKEN=1
 

diff --git a/Cores/VirtualJaguar b/Cores/VirtualJaguar
diff --git a/Cores/emuThree/PVEmuThreeCore/Core/PVEmuThreeCoreBridge.mm b/Cores/emuThree/PVEmuThreeCore/Core/PVEmuThreeCoreBridge.mm
@@ -164,8 +164,10 @@ - (void)setPauseEmulation:(BOOL)flag {
     [super setPauseEmulation:flag];
     if (flag)
         [CitraWrapper.sharedInstance pauseEmulation];
-    else
+    else {
+        [self setOptionValues];
         [CitraWrapper.sharedInstance resumeEmulation];
+    }
 }
 
 - (void)resetEmulation {
@@ -357,7 +359,11 @@ -(void)processOption:(NSString *)key value:(NSString*)value {
         },
     };
     Process action=[actions objectForKey:key];
-    if (action)
+    if (action) {
         action();
+    } else {
+        [self setOptionValues];
+        [CitraWrapper.sharedInstance setOptions:false];
+    }
 }
 @end
diff --git a/Cores/emuThree/PVEmuThreeCore/Core/PVEmuThreeCoreOptions.swift b/Cores/emuThree/PVEmuThreeCore/Core/PVEmuThreeCoreOptions.swift
@@ -6,8 +6,8 @@ import PVCoreBridge
 
     static var resolutionOption: CoreOption {
         .enumeration(.init(title: "Resolution Upscaling",
-                           description: "(Requires Restart)",
-                           requiresRestart: true),
+                           description: nil,
+                           requiresRestart: false),
                      values: [
                         .init(title: "1X", description: "1X", value: 1),
                         .init(title: "2X", description: "2X", value: 2),
@@ -32,9 +32,9 @@ import PVCoreBridge
     }
 
     static var cpuClockOption: CoreOption {
-        .enumeration(.init(title: "CPU Clock",
-                           description: "(Requires Restart) Underclocking can increase performance but may cause the game to freeze. Overclocking may reduce in game lag but also might cause freezes",
-                           requiresRestart: true),
+        .enumeration(.init(title: "CPU Clock Speed",
+                           description: "Underclocking can increase performance but may cause the game to freeze. Overclocking may reduce in game lag but also might cause freezes",
+                           requiresRestart: false),
                      values: [
                         .init(title: "10%", description: "10%", value: 10),
                         .init(title: "20%", description: "20%", value: 20),
@@ -65,15 +65,15 @@ import PVCoreBridge
         .bool(.init(
             title: "Enable Logging",
             description: "May affect performance",
-            requiresRestart: true),
+            requiresRestart: false),
               defaultValue: false)
     }
 
     static var enableNew3DSOption: CoreOption {
         .bool(.init(
             title: "Enable New 3DS",
             description: nil,
-            requiresRestart: true),
+            requiresRestart: false),
               defaultValue: true)
     }
 
@@ -91,7 +91,7 @@ import PVCoreBridge
         .bool(.init(
             title: "Enable Async Shader Compilation",
             description: nil,
-            requiresRestart: true),
+            requiresRestart: false),
               defaultValue: false)
     }
 
@@ -127,8 +127,8 @@ import PVCoreBridge
     static var enableShaderAccurateMulOption: CoreOption {
         .bool(.init(
             title: "Enable Shader Accurate Mul",
-            description: nil,
-            requiresRestart: true),
+            description: "Some games require this to be enabled to render properly, but slightly reduces performance",
+            requiresRestart: false),
               defaultValue: true)
     }
 

diff --git a/CoresRetro/RetroArch/PVRetroArch/Core.plist b/CoresRetro/RetroArch/PVRetroArch/Core.plist
@@ -405,7 +405,7 @@
 			<key>PVProjectVersion</key>
 			<string>v0.258</string>
 			<key>PVAppStoreDisabled</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>PVCoreIdentifier</key>

diff --git a/CoresRetro/RetroArch/PVRetroArchCore/Swift/PVRetroArchCore+Options.swift b/CoresRetro/RetroArch/PVRetroArchCore/Swift/PVRetroArchCore+Options.swift
@@ -247,7 +247,7 @@ extension PVRetroArchCoreBridge: CoreOptional {
                 systemIdentifier.contains("nes")  ||
                 systemIdentifier.contains("dreamcast")  ||
                 systemIdentifier.contains("genesis")  ||
-                systemIdentifier.contains("saturn")  ||
+//                systemIdentifier.contains("saturn")  ||
                 systemIdentifier.contains("3do")  ||
                 systemIdentifier.contains("gb")  ||
                 systemIdentifier.contains("segacd")  ||

diff --git a/Extensions/TopShelf/PVRecentGame+TopShelf.swift b/Extensions/TopShelf/PVRecentGame+TopShelf.swift
@@ -24,7 +24,7 @@ extension PVRecentGame {
         item.title = game.title
         let imageURl = URL(string: game.customArtworkURL.isEmpty ? game.originalArtworkURL : game.customArtworkURL)
         item.setImageURL(imageURl, forTraits: [.screenScale1x, .screenScale2x, .userInterfaceStyleDark, .userInterfaceStyleLight])
-        item.imageShape = game.system.imageType
+        item.imageShape = game.system?.imageType ?? .square
         item.displayURL = displayURL
         item.lastAccessedDate = lastPlayedDate
 

diff --git a/PVCoreLoader/Sources/PVCoreLoader/Resources/systems.plist b/PVCoreLoader/Sources/PVCoreLoader/Resources/systems.plist
@@ -1395,7 +1395,7 @@
 				<key>MD5</key>
 				<string>00dad01abdbf8ea9e79ad2fe11bdb182</string>
 				<key>Name</key>
-				<string>neogeo.zip|com.provenance.mame/neogeo.zip|hide</string>
+				<string>neogeo.zip</string>
 				<key>Size</key>
 				<integer>1859335</integer>
 			</dict>
@@ -1642,7 +1642,7 @@
 				<key>MD5</key>
 				<string>00dad01abdbf8ea9e79ad2fe11bdb182</string>
 				<key>Name</key>
-				<string>neogeo.zip|com.provenance.neogeo/neogeo.zip|hide</string>
+				<string>neogeo.zip</string>
 				<key>Size</key>
 				<integer>1859335</integer>
 			</dict>

diff --git a/PVLibrary/Sources/PVLibrary/Configuration/PVEmulatorConfiguration+Frameworks.swift b/PVLibrary/Sources/PVLibrary/Configuration/PVEmulatorConfiguration+Frameworks.swift
@@ -77,7 +77,7 @@ public extension PVEmulatorConfiguration {
             }
         }
         //this calls refresh anyway
-        RomDatabase.reloadCache(force: true)
+        await RomDatabase.reloadCache(force: true)
         #if DEBUG
         printListOfSystems()
         #endif

diff --git a/PVLibrary/Sources/PVLibrary/Database/Realm Database/RomDatabase+Caches.swift b/PVLibrary/Sources/PVLibrary/Database/Realm Database/RomDatabase+Caches.swift
@@ -19,21 +19,21 @@ public extension RomDatabase {
 
     /// Reload all caches
     /// - Parameter force: force a reload even if cache sizes match
-    static func reloadCaches(force: Bool = false) {
-        Task {
+    static func reloadCaches(force: Bool = false) async {
+//        Task {
             self.reloadSystemsCache(force: force)
             self.reloadBIOSCache()
             self.reloadCoresCache(force: force)
             self.reloadGamesCache(force: force)
-        }
+//        }
     }
 
     /// Refreash Realm and reload caches
     /// - Parameter force: force a reload even if cache sizes match
-    static func reloadCache(force: Bool = false) {
+    static func reloadCache(force: Bool = false) async {
         VLOG("RomDatabase:reloadCache")
         self.refresh()
-        self.reloadCaches(force: force)
+        await self.reloadCaches(force: force)
     }
 
     /// Reload BIOS cache
@@ -117,7 +117,7 @@ public extension RomDatabase {
     static func addGamesCache(_ game:PVGame) {
         Task {
             if await RomDatabase.gamesCache == nil {
-                self.reloadCache()
+                await self.reloadCache()
             }
             _gamesCache = await addGameCache(game, cache: RomDatabase.gamesCache ?? [:])
         }