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

tidying

Browse Source
This commit is contained in:
Eric 2023-05-30 15:11:03 -07:00
parent 84dde1bcf0
commit 18ff03aed7
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
.efrocachemap
View File

@ -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/22/34/9c6e311971f0e3fa8e54c8daa246",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/fb/d6/98273d4900876df499ce3eeaf361",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6f/0b/d133fa30c71b55fe9a74fc1566c8",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ff/d8/35c664ca3240e987b1583ba4dd45",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/01/97/93c7102a60ba833bb72b2c8a2d54",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/3f/4f/25171f50ccbd6ac79176b5b5fef3",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ea/d9/728e18ae1bab507f0c945eb1c655",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/75/f3/ddb8deb5bde3812552eb3d36f71f",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/be/e8/ad05d8293f0bdaa2c08fd0f63991",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/67/e3/baf1f62cd02099caecd60cf730e8",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b3/be/eb85ab4a6fdbfe8ee0e98ecdc103",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/8a/d8/9853c09db52bd79c50a479b3af2a",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/f2/8d/352428c787aecf14dfcee6effbf7",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/19/2c/d9cf78db6a2ead74e80309d94db5",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c0/a0/21b721e3c573d3a31cf1031ba26c",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/15/3e/f4760e8ef6b649dba231d7a0ceca",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/57/2f/651436ae6b72f37d7b22d8fb9d6c",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/e2/0e/a6ebee9cd0d483a78ca747065d44",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/0d/bc/27bdcdc662cbc4c30eb8df6b0cfc",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/63/03/5b3dc50d5ff12bc00091faa66d6d",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/9b/5a/2e57d92bd49c32716854e827b71e",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/32/ea/13f98e040b2bf944046346041d74",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/89/d6/002489b27c6e1fea3e34bf3be78a",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/cf/b6/263c06715ee5fa22376996589fd8",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/40/4a/7f808b6cb7adc311a45f6d8316f1",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/b1/90/46e457296568ea53d33d2bd45684",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/dc/98/d7c1578092f33711a9a35598851e",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/a3/d0/03780531e147bd77dd50ba609f5e",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/c9/c8/8a1391b84a42e318f65d45f750d4",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/52/83/df80fa75f67a956d2791877cab81",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/1f/bc/92f5d56317f1f992370fd669ce00",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/56/77/7d5b74a6be4e6416810bc6202091",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/c0/ce/3015c1ce7ef327ca2482c0881ba1",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/45/0c/cfaac054884219c8c4c212dfb2cd",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/0b/c3/d68f065ec79f8159add0626f0610",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/29/5c/3d1b5ea503fbfc59ece5ca869ff0",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/99/92/ff7812b81a96217092af3c443588",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/e6/87/81355e544cb9222c91fcdb69e4aa",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/f1/43/626c026a6ac4d681dc829111032e",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/27/5e/02c847cbecbc5f316548c061e1f5",
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/21/2f/7d4a687d49772e1e5ef78afe6953",
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/97/a8/64f3e8e31f4ea820da487e80776b",
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/7b/8e/e95a4dbbe3dd345463fc8fa0bd96",
@ -4108,14 +4108,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/27/38/c234ba181b79f2f02960dbed6f74",
"build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/5b/b8/c26d5a60d055ec764f63670b5c1f",
"build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/98/2f/7ed250c1d9c346cecb6e08a3b4a9",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/9e/b0/65db8b08f85ef9f83115c13168db",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/20/5b/8b6cebb37bcf05554ca39d3797e3",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/0d/57/f6ec440223b09c7aa5b3daa0104a",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/57/48/c35182859a71db36c15a88b68399",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/ca/6f/952eed4ce1dd6d4e721743d6f274",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/5c/bf/79a1a07dd329a9f84b9b31cc25b5",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/d7/d3/6fb6c212fd7dbf4c105bdf0d1e26",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/78/ad/d247c9c9050ff3efbcfd2f828115",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/fe/26/d29f2d6fba29d522b23dfe6559c8",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/3d/da/14557d469123377792c0e09c786e",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/6f/02/1e5f31c18bbedf0a8387e8ee3c25",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/c6/75/673608739f78a7902d994b960c40",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/4e/fe/1932ac089742c134a1b004eed2b6",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/ce/66/c77850f3097938d8067176640469",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/f3/ef/56ca9ced6b6a589f22baa85db006",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/1e/be/d7c743ea3e73b69f1e5bfdcb61af",
"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/b4/3d/e352190a0e5673d101c0f3ee3ad2",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.20 (build 21026, api 8, 2023-05-30)
### 1.7.20 (build 21027, api 8, 2023-05-30)
- 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

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

@ -31,7 +31,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be
# using.
TARGET_BALLISTICA_BUILD = 21026
TARGET_BALLISTICA_BUILD = 21027
TARGET_BALLISTICA_VERSION = '1.7.20'
_g_env_config: EnvConfig | None = None

13
src/ballistica/base/base.cc
View File

@ -219,7 +219,7 @@ void BaseFeatureSet::PrimeAppMainThreadEventPump() {
}
auto BaseFeatureSet::HavePlus() -> bool {
if (!tried_importing_plus_) {
if (!plus_soft_ && !tried_importing_plus_) {
python->SoftImportPlus();
// Important to set this *after* import attempt, or a second import attempt
// while first is ongoing can insta-fail. Multiple import attempts shouldn't
@ -236,7 +236,7 @@ void BaseFeatureSet::set_plus(PlusSoftInterface* plus) {
/// Access the plus feature-set. Will throw an exception if not present.
auto BaseFeatureSet::plus() -> PlusSoftInterface* {
if (!tried_importing_plus_) {
if (!plus_soft_ && !tried_importing_plus_) {
python->SoftImportPlus();
// Important to set this *after* import attempt, or a second import attempt
// while first is ongoing can insta-fail. Multiple import attempts shouldn't
@ -250,7 +250,7 @@ auto BaseFeatureSet::plus() -> PlusSoftInterface* {
}
auto BaseFeatureSet::HaveClassic() -> bool {
if (!tried_importing_classic_) {
if (!classic_soft_ && !tried_importing_classic_) {
python->SoftImportClassic();
// Important to set this *after* import attempt, or a second import attempt
// while first is ongoing can insta-fail. Multiple import attempts shouldn't
@ -262,7 +262,7 @@ auto BaseFeatureSet::HaveClassic() -> bool {
/// Access the plus feature-set. Will throw an exception if not present.
auto BaseFeatureSet::classic() -> ClassicSoftInterface* {
if (!tried_importing_classic_) {
if (!classic_soft_ && !tried_importing_classic_) {
python->SoftImportClassic();
// Important to set this *after* import attempt, or a second import attempt
// while first is ongoing can insta-fail. Multiple import attempts shouldn't
@ -274,13 +274,14 @@ auto BaseFeatureSet::classic() -> ClassicSoftInterface* {
}
return classic_soft_;
}
void BaseFeatureSet::set_classic(ClassicSoftInterface* classic) {
assert(classic_soft_ == nullptr);
classic_soft_ = classic;
}
auto BaseFeatureSet::HaveUIV1() -> bool {
if (!tried_importing_ui_v1_) {
if (!ui_v1_soft_ && !tried_importing_ui_v1_) {
python->SoftImportUIV1();
// Important to set this *after* import attempt, or a second import attempt
// while first is ongoing can insta-fail. Multiple import attempts shouldn't
@ -292,7 +293,7 @@ auto BaseFeatureSet::HaveUIV1() -> bool {
/// Access the plus feature-set. Will throw an exception if not present.
auto BaseFeatureSet::ui_v1() -> UIV1SoftInterface* {
if (!tried_importing_ui_v1_) {
if (!ui_v1_soft_ && !tried_importing_ui_v1_) {
python->SoftImportUIV1();
// Important to set this *after* import attempt, or a second import attempt
// while first is ongoing can insta-fail. Multiple import attempts shouldn't

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 = 21026;
const int kEngineBuildNumber = 21027;
const char* kEngineVersion = "1.7.20";
auto MonolithicMain(const core::CoreConfig& core_config) -> int {