diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index 9ed6bb43..347d14f8 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -446,5 +446,5 @@ end module Essentials VERSION = "20.1.dev" ERROR_TEXT = "" - MKXPZ_VERSION = "2.4" + MKXPZ_VERSION = "2.4.2" end diff --git a/Data/Scripts/001_Technical/001_MKXP_Compatibility.rb b/Data/Scripts/001_Technical/001_MKXP_Compatibility.rb index 2ff0c10a..196161ba 100644 --- a/Data/Scripts/001_Technical/001_MKXP_Compatibility.rb +++ b/Data/Scripts/001_Technical/001_MKXP_Compatibility.rb @@ -1,6 +1,5 @@ -# Using mkxp-z v2.4.0 - https://gitlab.com/mkxp-z/mkxp-z/-/releases/v2.4.0 +# Using mkxp-z v2.4.2 - https://github.com/mkxp-z/mkxp-z/releases/tag/v2.4.2 $VERBOSE = nil -begin; require 'zlib'; rescue; nil; end Font.default_shadow = false if Font.respond_to?(:default_shadow) Graphics.frame_rate = 40 Encoding.default_internal = Encoding::UTF_8 @@ -30,7 +29,7 @@ end module Graphics def self.delta_s - return self.delta.to_f / 1_000_000 + return self.delta end end diff --git a/Game.exe b/Game.exe index b6c05ed5..e630da7b 100644 Binary files a/Game.exe and b/Game.exe differ diff --git a/mkxp.json b/mkxp.json index eefccdc7..8adb2af3 100644 --- a/mkxp.json +++ b/mkxp.json @@ -8,8 +8,12 @@ // working directory (when compiled with // -DWORKDIR_CURRENT). All other paths are resolved // relative to gameFolder and ignoring both RTPs and - // encrypted archives. - + // encrypted archives. Since this is JSON, any + // backslashes in paths need to be escaped (i.e. a + // single backslash becomes a double backslash). If + // that's too much hassle, you can use a single forward + // slash instead (even on Windows). + // // Some influential environment variables, set them to either "1" or "0": // "MKXPZ_WINDOWS_CONSOLE" // - Enables/disables the extra console window on Windows. It appears by @@ -22,6 +26,10 @@ // "MKXPZ_FOLDER_SELECT" // - Allows the manual selection of the game's folder at startup. // Only works on macOS at the moment. + // "MTL_HUD_ENABLED" + // - On macOS 13 (Ventura) and over, provided the Metal backend is used, + // this will enable a full performance HUD containing more details than + // the built-in framerate display. // Specify the RGSS version to run under. @@ -69,6 +77,13 @@ // "smoothScaling": false, + // Apply Lanczos3 interpolation when game screen + // is upscaled (typically higher quality than linear) + // (default: disabled) + // + // "lanczos3Scaling": false, + + // Sync screen redraws to the monitor refresh rate // (default: disabled) // @@ -125,10 +140,10 @@ // "syncToRefreshrate": false, - // Don't use alpha blending when rendering text - // (default: disabled) + // A list of fonts to render without alpha blending. + // (default: none) // - // "solidFonts": false, + // "solidFonts": ["Arial", "Times New Roman"] // Prefer the use of Metal over OpenGL on macOS. @@ -146,8 +161,8 @@ // (default: true if Apple Silicon, false if Intel) // // "preferMetalRenderer": true, - - + + // Work around buggy graphics drivers which don't // properly synchronize texture access, most // apparent when text doesn't show up or the map @@ -200,8 +215,8 @@ // (default: enabled) // // "integerScalingLastMile": true, - - + + // Set the base path of the game to '/path/to/game' // (default: executable directory) // @@ -316,16 +331,17 @@ // "/usr/local/share/ruby/site_ruby"], - // Determines whether JIT is enabled. This probably + // Determines whether MJIT is enabled. This probably // won't work unless you also have the header file // that it needs. Only works with Ruby 2.6 or higher. + // This Ruby feature is experimental. // (default: false) // // "JITEnable": false, // Determines what level of verbosity to use when - // logging JIT events. Starts at 0, which is next + // logging MJIT events. Starts at 0, which is next // to nothing. Set it higher to see more. // (default: 0) // @@ -333,19 +349,27 @@ // Determines how many compiled methods that Ruby - // will keep in its cache. + // will keep in its MJIT cache. // (default: 100) // // "JITMaxCache": 100, // Determines how many times a function has to be - // called before it is compiled. + // called before it is compiled by MJIT. // (default: 10000) // // "JITMinCalls": 10000, + // Determines whether YJIT is enabled. + // Only works with Ruby 3.1 or higher. + // This Ruby feature is experimental. + // (default: false) + // + // "YJITEnable": false, + + // SoundFont to use for midi playback (via fluidsynth) // (default: none) // @@ -370,6 +394,13 @@ // "SESourceCount": 6 + // Number of streams to open for BGM tracks. If the game + // needs multitrack audio, this should be set to as many + // available tracks as the game needs. Maximum: 16. + // + // "BGMTrackCount": 1 + + // The Windows game executable name minus ".exe". By default // this is "Game", but some developers manually rename it. // mkxp needs this name because both the .ini (game diff --git a/x64-msvcrt-ruby310.dll b/x64-msvcrt-ruby310.dll index ba6e223e..03972bcc 100644 Binary files a/x64-msvcrt-ruby310.dll and b/x64-msvcrt-ruby310.dll differ diff --git a/zlib1.dll b/zlib1.dll index 571908d0..92b6761a 100644 Binary files a/zlib1.dll and b/zlib1.dll differ