From b1f00cd05b6b31eb0c7cff85b9ebd777dca073ea Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 27 Sep 2023 11:28:31 -0700 Subject: [PATCH] debug speed adjustments are now ctrl-plus/minus instead of just plus/minus --- .efrocachemap | 40 ++++++++++++++--------------- CHANGELOG.md | 5 +++- src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/base/input/input.cc | 12 ++++++--- src/ballistica/shared/ballistica.cc | 2 +- 5 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 3a7df5bc..a5292484 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4056,26 +4056,26 @@ "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "6c81d1a60622f49d40044c8706d7bb05", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "62fc890f8f89c61ac4f9115398d5bb39", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "6efb3f630d26baeb2b80c30cdddf90aa", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "7617fda847c7d266ebe51869c2da87d6", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "0ccb43af7bcb2e4168f06ad9da5d75c9", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "3eaf0b2db096db79515e92882125c0ad", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "54abd8dbfcbeaa4a083a500346cfdc08", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "ddac92f49840d335e22ee96f18219651", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "dde541c9422b550b1ee2f449893d870e", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "fbc55e0085fdf93d0a5245576df6b1f0", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "1ff2fd68ad51c33de16e2e08d08d9394", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "4886ab5f22950161fbe87c8fade07453", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "e1cd77c418b9ad22a31c654c76954c5a", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "4eba3abcc02e5375568e28af3aba8f24", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "071455b304d2cc338e83410885152a1b", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "8ad0a29cc1fd06e643ff2d2b74b74813", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "20c983102789107cfbf197c6798f184a", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "86c6eb5770512d5c838745282f7beb2e", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "d4584a0b3f5ba812ee7100df1f24edc6", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "3522a8eb50e7898ecd388402cd765848", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "e0024dec8c31eb2d8fc95fbb0d4b47cd", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "e1dfb19f2053264fa045d7696c6b7ef8", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "e1cf045115903985e1c8b8e6d59edd2d", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "1c2a5985b68a94694d376a0670051f07", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "0674acbd2e095cdff7422fdd7479d557", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "76fa53a12c76b35100ed11ffeb5bff15", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "ebd75bcd5e6348574056ec959defb869", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "6c3f0158e6e44d07d7f2f67522f0dfc2", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "eef003a1e798496d906e28a0b97b9f1c", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "e5aa46e6ae5e8bcfad8865a419db9282", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "418f7a4363f8af90b0406f7742bf5d4d", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "f4eab84579e9e3d61bc5d43b22444b20", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "4d36fd6a3aa5fd896cf041e42004af6a", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "2453cd5c7fbf4897680616b465f4327c", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "9796c56ac684edfc0e94487940fd2170", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "d28dcfe794efa95fb7a32cbca77513aa", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "fa26ee4b0826d1273fe8cb8efb9026c5", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "950a618f5f10d5eb2f0de0bcbda24e3b", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "74f0c85552c377d751ad2238ccbbf6ae", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "ac4501fb1918202e1e3a8be75bde217b", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "f3d305e647a7f77dd70a48f615cfd750", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "931ce8eab9859d20ad86c47d196ba62c", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "f3d305e647a7f77dd70a48f615cfd750", diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a8c6aee..c7186e07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.28 (build 21386, api 8, 2023-09-27) +### 1.7.28 (build 21387, api 8, 2023-09-27) - Massively cleaned up code related to rendering and window systems (OpenGL, SDL, etc). This code had been growing into a nasty tangle for 15 years @@ -24,6 +24,9 @@ should appear significantly smoother in some cases. Please let me know if it ever appears *less* smooth than before or if you see what looks like weird speed changes which could be timing problems. +- Debug speed adjustments are now Ctrl-plus or Ctrl-minus instead of just plus + or minus. This makes these safer in case we want to enable them in regular + builds at some point. - Renamed Console to DevConsole, and added an option under advanced settings to always show a 'dev' button onscreen which can be used to toggle it. The backtick key still works also for anyone with a keyboard. I plan to add more diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index a10a6bb7..e2f7254b 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21386 +TARGET_BALLISTICA_BUILD = 21387 TARGET_BALLISTICA_VERSION = '1.7.28' diff --git a/src/ballistica/base/input/input.cc b/src/ballistica/base/input/input.cc index 85594631..667773fb 100644 --- a/src/ballistica/base/input/input.cc +++ b/src/ballistica/base/input/input.cc @@ -1001,13 +1001,17 @@ void Input::HandleKeyPress(const SDL_Keysym* keysym) { case SDLK_EQUALS: case SDLK_PLUS: - g_base->app_mode()->ChangeGameSpeed(1); - handled = true; + if (keysym->mod & KMOD_CTRL) { + g_base->app_mode()->ChangeGameSpeed(1); + handled = true; + } break; case SDLK_MINUS: - g_base->app_mode()->ChangeGameSpeed(-1); - handled = true; + if (keysym->mod & KMOD_CTRL) { + g_base->app_mode()->ChangeGameSpeed(-1); + handled = true; + } break; case SDLK_F5: { diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 50529af6..0da3d4cb 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 21386; +const int kEngineBuildNumber = 21387; const char* kEngineVersion = "1.7.28"; const int kEngineApiVersion = 8;