RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-19 13:25:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tidying

Browse Source
This commit is contained in:
Eric Froemling 2025-01-23 17:06:36 -08:00
parent 5b3507ed9a
commit 11aa253bb6
No known key found for this signature in database
5 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.efrocachemap generated
View File

@ -4174,22 +4174,22 @@
"build/assets/windows/Win32/ucrtbased.dll": "bfd1180c269d3950b76f35a63655e9e1", "build/assets/windows/Win32/ucrtbased.dll": "bfd1180c269d3950b76f35a63655e9e1",
"build/assets/windows/Win32/vc_redist.x86.exe": "15a5f1f876503885adbdf5b3989b3718", "build/assets/windows/Win32/vc_redist.x86.exe": "15a5f1f876503885adbdf5b3989b3718",
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "dd3e4e8ff11d52d0b037b25fc1b5c936", "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "bcba337ed8ac9de4072ec4b0531cecc0",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "6752d51a0ee054517d45ca69d48cb4f0", "build/prefab/full/linux_arm64_gui/release/ballisticakit": "d9e3946c0fc9426b1989188bc7ad0bb5",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "17f3f78ea8a5129607d0a60e19994a7e", "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "13353d40a999bc4a28c37e510ca43632",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "fae424377a7ad5294ae4fbc3b42c5def", "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "3958d1b2c4b4e6248d128bb5095955c5",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "bdb34b97fefac8b002ebf697297a2575", "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "08c37833f49a94240b1836e7b4dd505d",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "d2b31a60257ff9fc555dd2fa945fe2c4", "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "bced16cde2c64a7e3a7cd519d74bcb33",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "d6198914a00af9aa512c2d63826295cb", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "7095335185d4a2e2af9b0fae22e59130",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "1a7bcf0d7e2e09338bb6a33d8cb728f5", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "f79ac1270c9ee5f60eba58a707271172",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "24753c27f7350af0272a46a4da1eae6e", "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "2330d36d16dab1997707d61b4f534b6a",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "5a9307f66cfb6d75aa39bb0567348ef0", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "abcea01332b6f67e2b7dd7be868d5fc5",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "e06d4b08b41e3b08bb5b6cdeae030e19", "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "f3e46531db8b827655bfbb188d03991b",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "deabf764c26a87c9b8fd5a39d4b81c9d", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "5c1086903c9a824c23ca6e5c640587df",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "9c00d5fd76516379c12b6cbac26a3479", "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "43697b9fed85f29f40d4820e135f20d5",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "2fc39a7eb6383104587a59648d71769f", "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "140ef329d160c07163f300c7317a4222",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "87cd7d4e2025c2eb466968456c4404fe", "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "15637cd60e5a2990ffc10d6470d7be58",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "98d2900c6ccb918dacad68f5ee1bda2b", "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "23847e31e247efc1f59ffbe046fd75be",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "2ee184af9b80d60afea7f97aba29cb16", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "2ee184af9b80d60afea7f97aba29cb16",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "37c5f795ccbaeffeb5d6ede4fe9f3c19", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "37c5f795ccbaeffeb5d6ede4fe9f3c19",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "2ee184af9b80d60afea7f97aba29cb16", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "2ee184af9b80d60afea7f97aba29cb16",
@ -4202,14 +4202,14 @@
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "d258789fd7bdc5092aab87ccb4601921", "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "d258789fd7bdc5092aab87ccb4601921",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "314516411d5ac8e991a6f742f399d4de", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "314516411d5ac8e991a6f742f399d4de",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "d258789fd7bdc5092aab87ccb4601921", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "d258789fd7bdc5092aab87ccb4601921",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "881ee81f8a5a779c9f4327704a7a3253", "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "e7c46aa9d11f7ac01821010e761c52e8",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "f76554bae2bab0530797ba6d31db1419", "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "615f8cb29d397fae99d8799b09dba888",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "cf8b6622235349bf46b2a0879f1091a7", "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "02d3ea8c69019e3e823757a681799060",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "b0051826e5d36dd43707f1ced6d6a9ad", "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "d5edce6ed01e5788365d237caf33b2bb",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "00d04e1715abbcce9680dff14ca7db40", "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "1418609b6fc9bccdb9bf7491ceb1006c",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "a15b81a930ebcac977b7cf51b82b5ab6", "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "116f2974f0d62881b7e0214bb3d55cf2",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "994fdd808e6cb7a11bcadc53a09f5061", "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "14673217ff28f3695c9fe764d0cf9d31",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a744d9185b3e40942dc4b170745d7372", "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "19085634b079ab18f88810588185aa0c",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad", "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "06042d31df0ff9af96b99477162e2a91", "src/ballistica/base/mgen/pyembed/binding_base.inc": "06042d31df0ff9af96b99477162e2a91",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.37 (build 22246, api 9, 2025-01-23) ### 1.7.37 (build 22247, api 9, 2025-01-23)
- Bumping api version to 9. As you'll see below, there's some UI changes that - Bumping api version to 9. As you'll see below, there's some UI changes that
will require a bit of work for any UI mods to adapt to. If your mods don't will require a bit of work for any UI mods to adapt to. If your mods don't
touch UI stuff at all you can simply bump your api version and call it a day. touch UI stuff at all you can simply bump your api version and call it a day.

2
src/assets/ba_data/python/baenv.py
View File

@ -53,7 +53,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be # Build number and version of the ballistica binary we expect to be
# using. # using.
TARGET_BALLISTICA_BUILD = 22246 TARGET_BALLISTICA_BUILD = 22247
TARGET_BALLISTICA_VERSION = '1.7.37' TARGET_BALLISTICA_VERSION = '1.7.37'

18
src/assets/ba_data/python/bascenev1lib/activity/coopscore.py
View File

@ -9,6 +9,7 @@ import random
import logging import logging
from typing import TYPE_CHECKING, override from typing import TYPE_CHECKING, override
from efro.util import strict_partial
import bacommon.bs import bacommon.bs
from bacommon.login import LoginType from bacommon.login import LoginType
import bascenev1 as bs import bascenev1 as bs
@ -1209,10 +1210,22 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
if isinstance(response, Exception): if isinstance(response, Exception):
logging.debug('Got error score-submit response: %s', response) logging.debug('Got error score-submit response: %s', response)
return return
assert isinstance(response, bacommon.bs.ScoreSubmitResponse) assert isinstance(response, bacommon.bs.ScoreSubmitResponse)
assert bui.app.classic is not None # Aim to have these effects run shortly after the final rating
bui.app.classic.run_bs_client_effects(response.effects) # hit happens.
with self.context:
assert self._begin_time is not None
delay = max(0, 5.5 - (bs.time() - self._begin_time))
assert bui.app.classic is not None
bs.timer(
delay,
strict_partial(
bui.app.classic.run_bs_client_effects, response.effects
),
)
def _got_score_results(self, results: dict[str, Any] | None) -> None: def _got_score_results(self, results: dict[str, Any] | None) -> None:
# pylint: disable=too-many-locals # pylint: disable=too-many-locals
@ -1229,6 +1242,7 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
# (really should make the submit_score call handle that stuff itself) # (really should make the submit_score call handle that stuff itself)
if self.expired: if self.expired:
return return
with self.context: with self.context:
# Delay a bit if results come in too fast. # Delay a bit if results come in too fast.
assert self._begin_time is not None assert self._begin_time is not None

2
src/ballistica/shared/ballistica.cc
View File

@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
namespace ballistica { namespace ballistica {
// These are set automatically via script; don't modify them here. // These are set automatically via script; don't modify them here.
const int kEngineBuildNumber = 22246; const int kEngineBuildNumber = 22247;
const char* kEngineVersion = "1.7.37"; const char* kEngineVersion = "1.7.37";
const int kEngineApiVersion = 9; const int kEngineApiVersion = 9;