mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-28 10:03:15 +08:00
epic mode is now properly in slow motion again
This commit is contained in:
Eric
parent
af5f518627
commit
6e99e1a74a
56
.efrocachemap
generated
56
.efrocachemap
generated
@ -4072,26 +4072,26 @@
|
||||
"build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/c5/09/4f10b8a21ba87aa5509cff7a164b",
|
||||
"build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/ff/0a/a354984f9c074dab0676ac7e4877",
|
||||
"build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/2a/1c/9ee5db6d1bceca7fa6638fb8abde",
|
||||
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/d4/26/b088ceb87917faecdf22fe036adc",
|
||||
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/6c/55/da248f57e63041de6bc576d8d5ac",
|
||||
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/dc/28/cb352e0ff313c45d453c840bcd7a",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/63/0f/6c77db4f8703dda0f69426abd6e3",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/c6/6a/cc6ca14db5d55d49d3957d0ab078",
|
||||
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/40/fd/de2558f278bf97ebde5db8675049",
|
||||
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/8e/6e/e2d5d8da43a1e135577a9a36c90c",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/48/fd/56d0cc6137f0a1c864a0a018548b",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/94/9b/5b05384233ebbfd18066d7b347ca",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/37/85/2b143d5c13c96604a86870b0351d",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d8/c4/e5ef74124a10c006caf74bcd5e5d",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/12/d9/16e443990547ec3a8c557bce1e9c",
|
||||
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/aa/00/adb9501b00a0c8166aa2e66e3cde",
|
||||
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/d8/39/9cbef7ae2ddd3fed3d1bb362ac1e",
|
||||
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/19/53/b99d48ebaf6f51ae34e5c758c16a",
|
||||
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/03/6d/30e34f0199482b7f52f263824197",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/12/ed/fb678499e58f562af6a89b241895",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/ab/15/8fe60f35c75e3c52baf947ae09dd",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/82/17/3cb74613e589d88079d2fc51d0a6",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/e4/b8/c101925870bb698b35ecf180762e",
|
||||
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ea/ac/927a791c93cc1e6160b7202c79d7",
|
||||
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/de/44/a79ac89addd007739685d89bae22",
|
||||
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c9/51/e112fb2c1e405cea79b24d619b8a",
|
||||
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6f/4f/9f14fd6402306c9ab0232b5e8185",
|
||||
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/1d/5a/9029e36f46a1a67dad5bb6c8a2ad",
|
||||
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/83/3a/a91a13479eadad7a0094ca0b0489",
|
||||
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/4b/20/5ecde2d5ce73329387cccbdcc92a",
|
||||
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/51/5b/b99e665602e0789c474d92b5691b",
|
||||
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/70/6c/d9423e05572e8a0d69c3ebdd3115",
|
||||
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/4a/84/6080c3100fbde22c6c41afb999cc",
|
||||
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/52/63/643b9d489fda791a9fd4269bc9e1",
|
||||
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/2a/fd/230e6813e3a758e27be5dcc7f246",
|
||||
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/77/fa/de0aff4e77956c656c23e4614c80",
|
||||
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/b8/da/ad8b96a52b4b0f957067a74f480c",
|
||||
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/23/c0/eed89d718d27961e6eb2abe13f62",
|
||||
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/29/3d/831bf3a5fff2bc54d63d71ac1d34",
|
||||
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/be/55/3602d941aee9de09cb774389e7e1",
|
||||
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/92/f5/1f53fbad721edd3d26006409a9ba",
|
||||
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/d9/c5/5e8d95be1ed33e417c8bcfda33f1",
|
||||
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/0d/a9/9294b2c1935467adec45ce12f998",
|
||||
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/66/b7/4be2fcf57b9bc9cb12d97d6ac298",
|
||||
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/4d/31/1654791c0ae8eb78b517b548f2f7",
|
||||
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/62/04/d4b18d10e866785b23756d48f91c",
|
||||
@ -4108,14 +4108,14 @@
|
||||
"build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/a7/38/f5ebf21a44b3968a1623ae839721",
|
||||
"build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/b7/fa/1f32d0fedf5e54092d434bff20ed",
|
||||
"build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/d2/5a/08f06543729620d0d08b31b4c0a4",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/ea/0d/87102c47c88a5077106bfb030417",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/11/6e/1b3922bdfc900fb97b597f654ff3",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/2c/77/e7f546cd770b3882a5a45c08fad7",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/fe/51/65adfa3db7103ae3a0091c8f074d",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/56/6a/64335024396af0c5937351bc47d5",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/0c/82/cabf653687553241a25bcd58abba",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/92/c6/81a1b6e477a46b2ec087ad955a22",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/f5/fd/bad2f69341a2db63af7714702fe2",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/27/9e/09ba177addf4728f8977fb3b0e69",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/b4/5a/c650ab354e214f6b532f1bbed952",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/9a/3e/2171d892b31fba64f264c5211377",
|
||||
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/32/df/e34d912551eb816c0f2760e281b4",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/5b/ec/11c0d050e8c7919dc087291262fd",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/99/e6/f269ceb5fa4893e6601696bdefc3",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/40/33/31f2ef159d286c0dd383557ab5ed",
|
||||
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/25/f6/5073484bf33596818469f86b2363",
|
||||
"src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa",
|
||||
"src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1",
|
||||
"src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/75/9f/bcf597b362c9f2480cb348188bdd",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
### 1.7.20 (build 21060, api 8, 2023-06-07)
|
||||
### 1.7.20 (build 21061, api 8, 2023-06-07)
|
||||
|
||||
- This seems like a good time for a `refactoring` release in anticipation of
|
||||
changes coming in 1.8. Basically this means that a lot of things will be
|
||||
@ -278,6 +278,8 @@
|
||||
form is found. This is necessary because there will be totally different
|
||||
concepts of game-activities/etc. in future scene versions so we need to use
|
||||
exact class names instead of the 'game' shortcut.
|
||||
- (build 21060) Fixed a bug where epic mode was not in slow motion (but sounds
|
||||
still were hehehehe).
|
||||
|
||||
### 1.7.19 (build 20997, api 7, 2023-01-19)
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ if TYPE_CHECKING:
|
||||
|
||||
# Build number and version of the ballistica binary we expect to be
|
||||
# using.
|
||||
TARGET_BALLISTICA_BUILD = 21060
|
||||
TARGET_BALLISTICA_BUILD = 21061
|
||||
TARGET_BALLISTICA_VERSION = '1.7.20'
|
||||
|
||||
_g_env_config: EnvConfig | None = None
|
||||
|
||||
@ -92,8 +92,10 @@ auto CoreConfig::FromCommandLineAndEnv(int argc, char** argv) -> CoreConfig {
|
||||
}
|
||||
|
||||
// REMOVE ME FOR 1.7.20 FINAL.
|
||||
printf("TEMP: forcing BA_LIFECYCLE_LOG=1 during 1.7.20 development.\n");
|
||||
cfg.lifecycle_log = true;
|
||||
if (explicit_bool(false)) {
|
||||
printf("TEMP: forcing BA_LIFECYCLE_LOG=1 during 1.7.20 development.\n");
|
||||
cfg.lifecycle_log = true;
|
||||
}
|
||||
|
||||
try {
|
||||
// First handle single-arg special cases like --help or --version.
|
||||
|
||||
@ -143,7 +143,7 @@ auto PythonClassActivityData::Start(PythonClassActivityData* self)
|
||||
if (!a) {
|
||||
throw Exception("Invalid activity data.", PyExcType::kActivityNotFound);
|
||||
}
|
||||
a->start();
|
||||
a->Start();
|
||||
|
||||
Py_RETURN_NONE;
|
||||
BA_PYTHON_CATCH;
|
||||
|
||||
@ -83,7 +83,6 @@ HostActivity::~HostActivity() {
|
||||
// in it.
|
||||
if (auto* host_session = host_session_.Get()) {
|
||||
for (auto timer_id : session_base_timer_ids_) {
|
||||
// printf("WOULD KILL BASE TIMER %d\n", timer_id);
|
||||
host_session->DeleteTimer(TimeType::kBase, timer_id);
|
||||
}
|
||||
}
|
||||
@ -160,7 +159,7 @@ void HostActivity::RegisterContextCall(base::PythonContextCall* call) {
|
||||
}
|
||||
}
|
||||
|
||||
void HostActivity::start() {
|
||||
void HostActivity::Start() {
|
||||
if (started_) {
|
||||
Log(LogLevel::kError, "HostActivity::Start() called twice.");
|
||||
return;
|
||||
@ -181,7 +180,7 @@ void HostActivity::start() {
|
||||
host_session->NewTimer(TimeType::kBase, kGameStepMilliseconds, true,
|
||||
NewLambdaRunnable([this] { StepScene(); }));
|
||||
session_base_timer_ids_.push_back(step_scene_timer_id_);
|
||||
SetGameSpeed(1.0f);
|
||||
UpdateStepTimerLength();
|
||||
}
|
||||
|
||||
auto HostActivity::GetAsHostActivity() -> HostActivity* { return this; }
|
||||
@ -245,14 +244,14 @@ void HostActivity::SetPaused(bool val) {
|
||||
}
|
||||
|
||||
void HostActivity::SetGameSpeed(float speed) {
|
||||
if (!started_) {
|
||||
return;
|
||||
}
|
||||
if (speed == game_speed_) {
|
||||
return;
|
||||
}
|
||||
assert(speed >= 0.0f);
|
||||
game_speed_ = speed;
|
||||
if (!started_) {
|
||||
return;
|
||||
}
|
||||
UpdateStepTimerLength();
|
||||
}
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@ class HostActivity : public SceneV1Context {
|
||||
assert(scene_.Exists());
|
||||
return scene_.Get();
|
||||
}
|
||||
void start();
|
||||
void Start();
|
||||
|
||||
// A utility function; faster than dynamic_cast.
|
||||
auto GetAsHostActivity() -> HostActivity* override;
|
||||
@ -110,7 +110,7 @@ class HostActivity : public SceneV1Context {
|
||||
bool started_{};
|
||||
int out_of_bounds_in_a_row_{};
|
||||
bool paused_{};
|
||||
float game_speed_{};
|
||||
float game_speed_{1.0f};
|
||||
millisecs_t base_time_{};
|
||||
Object::Ref<Scene> scene_;
|
||||
Object::WeakRef<HostSession> host_session_;
|
||||
|
||||
@ -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 = 21060;
|
||||
const int kEngineBuildNumber = 21061;
|
||||
const char* kEngineVersion = "1.7.20";
|
||||
|
||||
auto MonolithicMain(const core::CoreConfig& core_config) -> int {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user