diff --git a/CMakeLists.txt b/CMakeLists.txt index aebf948..8b9c3e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.25) -project(skate3 VERSION 1.0.0 LANGUAGES CXX) +project(skate3 VERSION 1.0.1 LANGUAGES CXX) if(WIN32) enable_language(RC) diff --git a/README.md b/README.md index 150f812..090dd7f 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,16 @@ Gameplay (click to go to YouTube): 5. Wait for the installer to extract the game files. 6. Click "Start Game". +### macOS (ARM / Experimental) + +1. Download the latest release Skate3Recomp-macOS.zip from the releases page. +2. Extract it anywhere you like, to a folder you control. +3. Run skate3 by double-clicking or "./skate3" in the Terminal. +4. You may need to approve it in System Preferences before macOS will allow you to run it. +5. Click "Select ISO" to select your legally obtained copy of Skate 3. +6. Wait for the installer to extract the game files. +7. Click "Start Game". + ## Controls - Standard Xbox controls using an Xbox controller are the preferred and main input method. DualShock and others are untested, but are likely to work with Steam Input through XInput. diff --git a/cmake/Skate3Version.cmake b/cmake/Skate3Version.cmake index a1ca492..e46cda1 100644 --- a/cmake/Skate3Version.cmake +++ b/cmake/Skate3Version.cmake @@ -23,8 +23,8 @@ function(skate3_compute_version out_var) message(FATAL_ERROR "skate3_compute_version: unparseable describe output '${ARG_GIT_DESCRIBE_LONG}'") endif() - set(commit_count ${CMAKE_MATCH_6}) - set(short_sha ${CMAKE_MATCH_7}) + set(commit_count ${CMAKE_MATCH_4}) + set(short_sha ${CMAKE_MATCH_5}) set(${out_var} "${ARG_FLOOR_VERSION}.${commit_count}-dev.g${short_sha}" PARENT_SCOPE) endfunction() diff --git a/src/skate3_app_common.cpp b/src/skate3_app_common.cpp index d0f50d3..32b2bed 100644 --- a/src/skate3_app_common.cpp +++ b/src/skate3_app_common.cpp @@ -202,7 +202,11 @@ bool DeveloperConfigHasResolutionScaleOverride(const std::filesystem::path& conf "draw_resolution_scale_y"}); } +#if REX_PLATFORM_MAC +constexpr int kDefaultResolutionScale = 1; +#else constexpr int kDefaultResolutionScale = 2; +#endif void ApplyFirstRunVideoDefaults(const std::filesystem::path& settings_path, const std::filesystem::path& developer_config_path) { @@ -287,6 +291,12 @@ void Skate3BaseApp::OnConfigureFonts(ImFontAtlas* atlas) { "C:\\Windows\\Fonts\\helvetica.ttf", "C:\\Windows\\Fonts\\HelveticaNeue.ttf", "C:\\Windows\\Fonts\\arial.ttf", +#elif defined(__APPLE__) + "/System/Library/Fonts/SFNS.ttf", + "/System/Library/Fonts/SFCompact.ttf", + "/System/Library/Fonts/HelveticaNeue.ttc", + "/System/Library/Fonts/LucidaGrande.ttc", + "/System/Library/Fonts/Supplemental/Arial.ttf", #else "/usr/share/fonts/truetype/noto/NotoSans-Regular.ttf", "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf", diff --git a/third_party/rexglue-sdk b/third_party/rexglue-sdk index 5b6b87b..97ab3e1 160000 --- a/third_party/rexglue-sdk +++ b/third_party/rexglue-sdk @@ -1 +1 @@ -Subproject commit 5b6b87bcea1d70b6922815890bb81adc929ea106 +Subproject commit 97ab3e107db8f2599742a5f60a1981be61c6542c