Merge remote-tracking branch 'upstream/master'

Author: Hancock33

batocera-Changelog.md

@@ -34,6 +34,7 @@
 - Cannonball coin is now the Select button
 - Cannonball fullscreen on Wayland
 - Commander Genius fullscreen in Wayland
+- Commander Genius render resolution option not taking effect in-game
 - Jedi Knight Dark Forces 2 initial start to work fullscreen in certain conditions
 - Libretro-Hatarib not starting due to a compiled symbol issue
 - Mupen64 not starting fullscreen with Wayland
@@ -74,20 +75,24 @@
 - BigPEmu to 1.221
 - Blake Stone to v1.3.4
 - Box64 0.4.2
+- CatacombGL to Jun 20, 2026 build
 - Cemu to August 7th, 2026 build
 - CDogs to 2.4.0
 - CLK to 2026-07-23
 - Commander Genius to v3.6.3
-- CorsixTH to v0.70.0
+- CorsixTH to v0.70.1
 - DevilutionX to 1.5.5
 - Dhewm3 & Mods to 1.5.5
 - Dolphin-Emu to 2606
+- DXX-Rebirth to Aug 23, 2026 build
 - ECWolf to Feb 23, 2026 build
-- EDuke32 / Fury to Feb 03, 2026 build
+- EDuke32 / Fury to Aug 07, 2026 build
 - ETLegacy to v2.85.0
 - Flycast to v2.7
 - Groovy MAME to 0.289
-- IOQuake3 to Mar 9, 2026
+- Hurrican to Apr 5, 2026 build
+- Hydra Castle Labyrinth to Aug 11, 2026 build
+- IOQuake3 to Jul 16, 2026
 - Jazz2 to 3.8.0
 - Ledspicer to 0.7.6
 - Libretro-81 to April 20th, 2026 build
@@ -207,8 +212,9 @@
 - LinuxLoader to v3.0.10
 - Moonlight-QT to Jun 26, 2026 build
 - Mupen64Plus-Core to March 30th, 2026 build
+- OpenJazz to Mar 01, 2026 build
 - OpenMSX to Release 21
-- OpenJK to May 13th, 2026 build
+- OpenJK to Jul 11th, 2026 build
 - OpenJKDF2 to v0.9.9
 - PCSX2 to 2.8.0
 - Play to 0.77
@@ -224,11 +230,14 @@
 - TheXTech to v1.3.7.3-1
 - TRX to 1.10.2
 - Tsugaru to v20251206
+- Ur-Quan Masters to Aug 21, 2026 build
 - Vita3k to 10th of June build
-- VKQuake to 1.35.0
+- VKQuake to 1.36.0
+- vkQuake2 to Aug 5, 2026 build
 - VKQuake3 to 1.36
 - Winetricks to 20260125
 - X16emu to r49
+- Xash3D-FWGS (Half-Life engine + HLSDK mobile_hacks/dmc/opfor) to Aug 27, 2026 build
 - Xemu to v0.8.136
 - Xenia to v1.0.2844
 - Xenia Canary to August 29th, 2026 build

package/batocera/core/batocera-configgen/configgen/configgen/generators/cgenius/cgeniusGenerator.py

@@ -72,17 +72,18 @@ def generate(self, system, rom, playersControllers, metadata, guns, wheels, game
         # render resolution
         match system.config.get("cgenius_render"):
             case "240":
-                config["Video"]["gameHeight"] = "240"
-                config["Video"]["gameWidth"] = "320"
+                gameWidth, gameHeight = "320", "240"
             case "360":
-                config["Video"]["gameHeight"] = "360"
-                config["Video"]["gameWidth"] = "640"
+                gameWidth, gameHeight = "640", "360"
             case "480":
-                config["Video"]["gameHeight"] = "480"
-                config["Video"]["gameWidth"] = "640"
+                gameWidth, gameHeight = "640", "480"
             case _:
-                config["Video"]["gameHeight"] = "200"
-                config["Video"]["gameWidth"] = "320"
+                gameWidth, gameHeight = "320", "200"
+        for engineSection in ("Launcher", "Vorticon", "Galaxy", "Cosmos"):
+            if engineSection not in config:
+                config[engineSection] = {}
+            config[engineSection]["gameWidth"] = gameWidth
+            config[engineSection]["gameHeight"] = gameHeight
         # mouse
         config["Video"]["ShowCursor"] = system.config.get("cgenius_cursor", "false")
 

package/batocera/core/batocera-configgen/configgen/configgen/generators/etlegacy/etlegacyGenerator.py

@@ -24,7 +24,7 @@ def getHotkeysContext(self) -> HotkeysContext:
     def generate(self, system, rom, playersControllers, metadata, guns, wheels, gameResolution):
 
         etLegacyDir = ROMS / "etlegacy" / "legacy"
-        etLegacyFile = "legacy_2.84-dirty.pk3"
+        etLegacyFile = "legacy_2.85-dirty.pk3"
         etLegacySource = Path("/usr/share/etlegacy") / etLegacyFile
         etLegacyDest = etLegacyDir / etLegacyFile
 

package/batocera/core/batocera-configgen/configgen/configgen/generators/openjazz/openjazzGenerator.py

@@ -56,11 +56,12 @@ def _write_int(writer: IO[bytes], data: int, /) -> None:
 @dataclass(slots=True)
 class _OpenJazzConfig:
     path: Path
-    version: int = 6
+    version: int = 7
     video_width: int = 640
     video_height: int = 480
     fullscreen: bool = True
     video_scale: int = 1
+    scale_method: int = 0
     keys: list[int] = field(default_factory=lambda: [
         1073741906,  # Up
         1073741905,  # Down
@@ -148,18 +149,20 @@ class _OpenJazzConfig:
     many_birds: bool = False
     leave_unneeded: bool = False
     slow_motion: bool = False
-    scale_2x: bool = True
+    hud_fps: bool = False
 
     def save(self) -> None:
         _logger.info("Saving configuration")
         try:
             with self.path.open('wb') as f:
                 # Version
-                _write_char(f, 6)
+                _write_char(f, 7)
 
                 _write_short(f, self.video_width)
                 _write_short(f, self.video_height)
-                _write_char(f, (self.video_scale << 1) | self.fullscreen)
+                _write_char(f, self.fullscreen)
+                _write_char(f, self.video_scale)
+                _write_char(f, self.scale_method)
 
                 for key in self.keys:
                     _write_int(f, key)
@@ -183,7 +186,7 @@ def save(self) -> None:
 
                 _write_char(f, self.music_volume)
                 _write_char(f, self.sound_volume)
-                _write_char(f, self.many_birds | (self.leave_unneeded << 1) | (self.slow_motion << 2) | (self.scale_2x << 3))
+                _write_char(f, self.many_birds | (self.leave_unneeded << 1) | (self.slow_motion << 2) | (self.hud_fps << 3))
         except Exception:
             _logger.exception("Error saving configuration")
 
@@ -209,14 +212,9 @@ def load(cls, path: Path, /) -> Self:
                 video_width = _read_short(f)
                 video_height = _read_short(f)
 
-                video_options = _read_char(f)
-
-                fullscreen = bool(video_options & 1)
-
-                if video_options >= 10:
-                    video_options = 2
-
-                video_scale = video_options >> 1
+                fullscreen = bool(_read_char(f))
+                video_scale = _read_char(f)
+                scale_method = _read_char(f)
 
                 keys = [_read_int(f) for _ in range(_CONTROLS - 4)]
                 buttons = [_read_int(f) for _ in range(_CONTROLS)]
@@ -234,7 +232,7 @@ def load(cls, path: Path, /) -> Self:
                 many_birds = bool(opts & 1)
                 leave_unneeded = bool(opts & 2)
                 slow_motion = bool(opts & 4)
-                scale_2x = not bool(opts & 8)
+                hud_fps = bool(opts & 8)
 
                 return cls(
                     path,
@@ -243,6 +241,7 @@ def load(cls, path: Path, /) -> Self:
                     video_height=video_height,
                     fullscreen=fullscreen,
                     video_scale=video_scale,
+                    scale_method=scale_method,
                     keys=keys,
                     buttons=buttons,
                     axes=axes,
@@ -254,7 +253,7 @@ def load(cls, path: Path, /) -> Self:
                     many_birds=many_birds,
                     leave_unneeded=leave_unneeded,
                     slow_motion=slow_motion,
-                    scale_2x=scale_2x,
+                    hud_fps=hud_fps,
                 )
         except Exception:
             _logger.exception('Error loading configuration')
@@ -275,14 +274,15 @@ def print_config(self, cfg: _OpenJazzConfig, /):
         _logger.info("Resolution: %sx%s", cfg.video_width, cfg.video_height)
         _logger.info("Fullscreen: %s", cfg.fullscreen)
         _logger.info("Video Scale: %s", cfg.video_scale)
+        _logger.info("Scale Method: %s", cfg.scale_method)
         _logger.info("Character Name: %s", cfg.character_name)
         _logger.info("Character Colors: %s", cfg.character_colors)
         _logger.info("Music Volume: %s", cfg.music_volume)
         _logger.info("Sound Volume: %s", cfg.sound_volume)
         _logger.info("Many Birds: %s", cfg.many_birds)
         _logger.info("Leave Unneeded: %s", cfg.leave_unneeded)
         _logger.info("Slow Motion: %s", cfg.slow_motion)
-        _logger.info("Scale2x: %s", cfg.scale_2x)
+        _logger.info("HUD FPS: %s", cfg.hud_fps)
         _logger.info("Controls Configuration:")
         _logger.info("Keys: %s", cfg.keys)
         _logger.info("Buttons: %s", cfg.buttons)
@@ -336,6 +336,12 @@ def generate(self, system, rom, playersControllers, metadata, guns, wheels, game
         cfg.video_width = int(width_str)
         cfg.video_height = int(height_str)
 
+        # Scaler: 0=None, 1=Bilinear, 2=Scale2x, 3=hqx
+        cfg.scale_method = int(system.config.get("jazz_scaler", "0"))
+
+        # Integer pixel-scale factor (clamped 1-4 by the engine)
+        cfg.video_scale = int(system.config.get("jazz_video_scale", "1"))
+
         # Save the changes
         cfg.save()
 

package/batocera/core/batocera-configgen/configgen/configgen/generators/steam/steamGenerator.py

@@ -37,3 +37,6 @@ def getHotkeysContext(self) -> HotkeysContext:
             "name": "steam",
             "keys": { "exit": ["KEY_LEFTALT", "KEY_F4"] }
         }
+
+    def getInGameRatio(self, config, gameResolution, rom):
+        return 16 / 9

package/batocera/core/batocera-configgen/configgen/configgen/generators/themehospital/themehospitalGenerator.py

@@ -93,8 +93,8 @@ def generate(self, system, rom, playersControllers, metadata, guns, wheels, game
             'hu_HU': 'hu',
             'pt_PT': 'pt',
             'pt_BR': 'br',
-            'zh_CN': 'zhs',
-            'zh_TW': 'zht',
+            'zh_CN': 'zh(s)',
+            'zh_TW': 'zh(t)',
             'ko_KR': 'ko',
             'nb_NO': 'nb',
             'nn_NO': 'nb',

package/batocera/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/xash3dFwgsGenerator.py

@@ -119,7 +119,7 @@ def generate(self, system, rom, playersControllers, metadata, guns, wheels, game
         commandArray.append('-game')
         commandArray.append(game)
 
-        commandArray.append('+showfps')
+        commandArray.append('+cl_showfps')
         commandArray.append('1' if system.config.show_fps else '0')
 
         self._maybeInitConfig(game)

package/batocera/ports/corsixth/corsixth.mk

@@ -3,8 +3,8 @@
 # corsixth
 #
 ################################################################################
-# Version: Commits on Jan 10, 2026
-CORSIXTH_VERSION = v0.69.2
+# Version: Commits on Aug 28, 2026
+CORSIXTH_VERSION = v0.70.1
 CORSIXTH_SITE = $(call github,CorsixTH,CorsixTH,$(CORSIXTH_VERSION))
 CORSIXTH_DEPENDENCIES = ffmpeg libcurl lpeg lua luafilesystem lua-lpeg-patterns luasec luasocket rtmidi
 CORSIXTH_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer

package/batocera/ports/openjazz/openjazz.emulator.yml

@@ -33,5 +33,21 @@ custom_features:
       2560 x 1440: 2560x1440
       2560 x 1600: 2560x1600
       3840 x 2160: 3840x2160
+  jazz_scaler:
+    prompt: SCALER
+    description: Enhancement. Pixel-art scaling filter applied to the low-resolution game image before it's stretched to fill the render resolution.
+    choices:
+      None (Default): "0"
+      Bilinear: "1"
+      Scale2x: "2"
+      HQX: "3"
+  jazz_video_scale:
+    prompt: INTEGER SCALE FACTOR
+    description: Enhancement. Pixel-doubles the game image by this integer factor before applying the scaler, as long as it still fits the render resolution.
+    choices:
+      1x (Default): "1"
+      2x: "2"
+      3x: "3"
+      4x: "4"
 systems:
   - openjazz

package/batocera/ports/uqm/uqm.mk

@@ -3,8 +3,8 @@
 # uqm
 #
 ################################################################################
-# Version: Commits on Apr 05, 2024
-UQM_VERSION = d6583f2250e6046de0bcd20e18ba78e8620fb638
+# Version: Commits on Aug 22, 2026
+UQM_VERSION = a0d90e239b3a8e3dcb9d732fd76a385aac2593e5
 UQM_SITE = https://git.code.sf.net/p/sc2/uqm
 UQM_SITE_METHOD = git
 UQM_DEPENDENCIES = sdl2 libpng libvorbis libzip