RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-29 02:23:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

clearing up some internal bits

Browse Source
This commit is contained in:
Eric Froemling 2024-11-22 14:07:57 -08:00
parent bfe37d1789
commit bc808c65fc
No known key found for this signature in database
5 changed files with 41 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
.efrocachemap generated
View File

@ -4099,42 +4099,42 @@
"build/assets/windows/Win32/ucrtbased.dll": "bfd1180c269d3950b76f35a63655e9e1",
"build/assets/windows/Win32/vc_redist.x86.exe": "15a5f1f876503885adbdf5b3989b3718",
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "a8fd259ae8c02279bccefa91d8fd6ac2",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "4619ac5fab8c69735cfaef25ea7c065d",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "fd511ea30c513dbc978d74e19e08b3e6",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "af18930837a84816ef1ebfd0039b9919",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "c804d217ad66edb7fd3a1ed04c41a1f3",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "3d7312a940aa00a568dd93b45184499d",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "d6b43f5a05e123ec2c72d2dd53b96960",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "7311c1fe4e092b3a9c92bcfba83a7c68",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "511c91b254492144c914f8bffdf1c460",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "fcd1e286bad46b9f31337303a5e4214c",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "145744ef2c59aea5a2a9f5f34e9e0cd9",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ad0bcff8515b525050b7ebe4b99dc6ab",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "6141ba22c8ed17d3fa4d57a442316060",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "5dfe81423ae63743ba04b1a4f2641f63",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "bfb48630550972e4a4d07d9379414eb9",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "6fcdaecfe23368a8305ffa80f3fec1d4",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "9d953b981a1ccf4623a6947ee9bafde7",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "b7d3fd701b31ec1b624606e1ca42e4bb",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "9d953b981a1ccf4623a6947ee9bafde7",
"build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "b7d3fd701b31ec1b624606e1ca42e4bb",
"build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "2141f1d64ea3eadac63e6e95c517b751",
"build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "5d04a19962d612f977200e27b194f560",
"build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "2141f1d64ea3eadac63e6e95c517b751",
"build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "5d04a19962d612f977200e27b194f560",
"build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "d0a989e1650ba8e19ac7f661355ca7cd",
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "a2ebc84706ed89c1558f3171e985a959",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "d0a989e1650ba8e19ac7f661355ca7cd",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "a2ebc84706ed89c1558f3171e985a959",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "6c1f5c04ba6d0d8839575dc65e47f718",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "0a680dc69ece80160c3d945a63acf5bc",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "bcc195c916aa4dce47c99137c0bc257f",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "9baa944d32597cc3eae9fb8ba345ea73",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "0f9a3fb536ce1e1b486b9d0249e4efad",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "6c07f42a4e80471e904214490d6ec541",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "83eeefc24aad8efdfe9cbe6ed60edcc4",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "5ebc79bcce3728692b0a44066fe47f63",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "809ad854c769646c9bccf9f72bfd2f9f",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "84f339cbec284e824904613e59cab1a2",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "2c385ed88eaf7787c4bf36b2681ccd91",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "2156812371a87399fb3e0fff856fc739",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "40b5aacb91774c9343d674a15801f6d9",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "8833e259a48cdb79a958d0ed18b56a65",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "b5b8df8478e0d8513f6273d00bf97779",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "e016a4a952ee8947169a2dfc34718a9f",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "fffe409a157aa345ba9193f992d2b752",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "df686ee58c36af1100d20fa7a4deb08e",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "70373843b698d5c4400a9cbb916d8d21",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "f68567c5d2d5ea680c26578c2dc7a912",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "71137c9d5d96923d4d5687de021488cd",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "f37c138bc5b6c17effa49159cc30db91",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "fecc9bbd4ebb50b633313077206c1504",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "2d30efa541a0bd38fe578ce0baf929a6",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "e8b47cf217d05ce0df5a334e3b456ced",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "014014670516ce58a7d7dd3c39f12c84",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "e8b47cf217d05ce0df5a334e3b456ced",
"build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "014014670516ce58a7d7dd3c39f12c84",
"build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "713c6046e9e061ac045c65f593a1dafb",
"build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "107aa28e8e7568ff6fca408728b80d94",
"build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "713c6046e9e061ac045c65f593a1dafb",
"build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "107aa28e8e7568ff6fca408728b80d94",
"build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "ffe19b0ae94217a0ed7ccc3d46c97a24",
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "3f3a18dc4d6118ec181d03df1d0bd4de",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "ffe19b0ae94217a0ed7ccc3d46c97a24",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "3f3a18dc4d6118ec181d03df1d0bd4de",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "6eeb79220b31acc56da748201090218f",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "ade915a77be68916691c0329f8cfdd9f",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "67b55ef9f0d683340ef61c1df08de181",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "689fd22835bb965b5e7fafe5149f8319",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "fdc1fa0dbaca6e517f2608bcc7476e96",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "6af6ad18c0486410454db2a53b72e458",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "f496932bed2c235654829404741b4526",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "5ec6c0c883ca79b2eec1f7b952ecaa39",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "3a583e7e03bd4907b21adc3bf5729d15",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.37 (build 22107, api 9, 2024-11-22)
### 1.7.37 (build 22110, api 9, 2024-11-22)
- 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
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
# using.
TARGET_BALLISTICA_BUILD = 22107
TARGET_BALLISTICA_BUILD = 22110
TARGET_BALLISTICA_VERSION = '1.7.37'

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

@ -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 = 22107;
const int kEngineBuildNumber = 22110;
const char* kEngineVersion = "1.7.37";
const int kEngineApiVersion = 9;

103
tools/bacommon/cloud.py
View File

@ -4,11 +4,11 @@
from __future__ import annotations
from dataclasses import dataclass, field
from typing import TYPE_CHECKING, Annotated, override, assert_never
from typing import TYPE_CHECKING, Annotated, override
from enum import Enum
from efro.message import Message, Response
from efro.dataclassio import ioprepped, IOAttrs, IOMultiType
from efro.dataclassio import ioprepped, IOAttrs
from bacommon.transfer import DirectoryManifest
from bacommon.login import LoginType
@ -323,102 +323,3 @@ class BSPrivatePartyResponse(Response):
tokens: Annotated[int, IOAttrs('t')]
gold_pass: Annotated[bool, IOAttrs('g')]
datacode: Annotated[str | None, IOAttrs('d')]
# MOVE THIS
class CloudSubscriptionRequestTypeID(Enum):
"""Type ID for each of our subclasses."""
TEST = 'test'
# MOVE THIS
class CloudSubscriptionRequest(IOMultiType[CloudSubscriptionRequestTypeID]):
"""Top level class for our multitype."""
@override
@classmethod
def get_type_id(cls) -> CloudSubscriptionRequestTypeID:
# Require child classes to supply this themselves. If we
# did a full type registry/lookup here it would require us
# to import everything and would prevent lazy loading.
raise NotImplementedError()
@override
@classmethod
def get_type(
cls, type_id: CloudSubscriptionRequestTypeID
) -> type[CloudSubscriptionRequest]:
"""Return the subclass for each of our type-ids."""
# pylint: disable=cyclic-import
out: type[CloudSubscriptionRequest]
t = CloudSubscriptionRequestTypeID
if type_id is t.TEST:
out = TestCloudSubscriptionRequest
else:
# Important to make sure we provide all types.
assert_never(type_id)
return out
# MOVE THIS
@ioprepped
@dataclass
class TestCloudSubscriptionRequest(CloudSubscriptionRequest):
"""Just a test."""
@override
@classmethod
def get_type_id(cls) -> CloudSubscriptionRequestTypeID:
return CloudSubscriptionRequestTypeID.TEST
# MOVE THIS
class CloudSubscriptionValueTypeID(Enum):
"""Type ID for each of our subclasses."""
TEST = 'test'
# MOVE THIS
class CloudSubscriptionValue(IOMultiType[CloudSubscriptionValueTypeID]):
"""Top level class for subscription values."""
@override
@classmethod
def get_type_id(cls) -> CloudSubscriptionValueTypeID:
# Require child classes to supply this themselves. If we
# did a full type registry/lookup here it would require us
# to import everything and would prevent lazy loading.
raise NotImplementedError()
@override
@classmethod
def get_type(
cls, type_id: CloudSubscriptionValueTypeID
) -> type[CloudSubscriptionValue]:
"""Return the subclass for each of our type-ids."""
# pylint: disable=cyclic-import
out: type[CloudSubscriptionValue]
t = CloudSubscriptionValueTypeID
if type_id is t.TEST:
out = TestCloudSubscriptionValue
else:
# Important to make sure we provide all types.
assert_never(type_id)
return out
@ioprepped
@dataclass
class TestCloudSubscriptionValue(CloudSubscriptionValue):
"""Just a test."""
value: Annotated[int | None, IOAttrs('v')]
@override
@classmethod
def get_type_id(cls) -> CloudSubscriptionValueTypeID:
return CloudSubscriptionValueTypeID.TEST