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

wsl assetpack builds and more 1.7.37 work

Browse Source
This commit is contained in:
Eric 2024-11-04 13:52:57 -08:00
parent 402dfc66c5
commit 202c26d0e3
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
7 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
.efrocachemap generated
View File

@ -421,8 +421,8 @@
"build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26",
"build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8",
"build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55",
"build/assets/ba_data/data/langdata.json": "1f4ee8b8b810e7b644291f775cb06bf0",
"build/assets/ba_data/data/languages/arabic.json": "609f5d698a488e40e61787b62ee8ea5e",
"build/assets/ba_data/data/langdata.json": "09c12ac33695c54895dd9ff2094785fb",
"build/assets/ba_data/data/languages/arabic.json": "4a6fc46285d6289ee14a7ccd9e801ac4",
"build/assets/ba_data/data/languages/belarussian.json": "3d5523d0004293aa2df02f3f6f3b84f8",
"build/assets/ba_data/data/languages/chinese.json": "57d199cfd2a5cf493e777dd96cc12f7c",
"build/assets/ba_data/data/languages/chinesetraditional.json": "d85c58cc1e0e4bd0b09b2bc768cb1971",
@ -432,7 +432,7 @@
"build/assets/ba_data/data/languages/dutch.json": "734357560f53b4820221f6d60a0b79e8",
"build/assets/ba_data/data/languages/english.json": "a13015c5fea152cf84f5988e5cab9298",
"build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880",
"build/assets/ba_data/data/languages/filipino.json": "30f9622136067fe866bebf7e81ee8546",
"build/assets/ba_data/data/languages/filipino.json": "69c01f1ff6783db2c43e268372719236",
"build/assets/ba_data/data/languages/french.json": "e0bf81cff0497dd84044442606cc878e",
"build/assets/ba_data/data/languages/german.json": "c4b8c4d3c078b7902155af3221cf9cf4",
"build/assets/ba_data/data/languages/gibberish.json": "48bd2b7f70bdb76ac217c27c06f7a294",
@ -440,22 +440,22 @@
"build/assets/ba_data/data/languages/hindi.json": "5f60453c7dd3853c95c6f822e92d5300",
"build/assets/ba_data/data/languages/hungarian.json": "9d88004a98f0fbe2ea72edd5e0b3002e",
"build/assets/ba_data/data/languages/indonesian.json": "2ccb3fe081ead7706dbebb1008a8bc4e",
"build/assets/ba_data/data/languages/italian.json": "d9eb41f6eafb19040f8d5c0608790b62",
"build/assets/ba_data/data/languages/italian.json": "3557cd4697da8c59ed33bda066e8cd93",
"build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597",
"build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f",
"build/assets/ba_data/data/languages/persian.json": "fc25780341e0dfebc393e4c1c846b7a9",
"build/assets/ba_data/data/languages/piratespeak.json": "da60ddd83706b0e9e61c7ef9b6e7c975",
"build/assets/ba_data/data/languages/piratespeak.json": "cf06347db93a2d7a5a7971554c82f8cd",
"build/assets/ba_data/data/languages/polish.json": "89333fb207f9eb2f22fff5a95b022c35",
"build/assets/ba_data/data/languages/portuguese.json": "ac198f63b4af6e1f25044e92b953b96e",
"build/assets/ba_data/data/languages/portuguese.json": "be6647d0000ad5dac2e8b993ef24c64a",
"build/assets/ba_data/data/languages/romanian.json": "5ae206fe0b71c4015b02b86da8931c8f",
"build/assets/ba_data/data/languages/russian.json": "0fcc60bf1e8e19a74f02b0798728ec68",
"build/assets/ba_data/data/languages/russian.json": "ae561eadaab82b741b68fb8a968ad42b",
"build/assets/ba_data/data/languages/serbian.json": "623fa4129a1154c2f32ed7867e56ff6a",
"build/assets/ba_data/data/languages/slovak.json": "3c08c748c96c71bd9e1d7291fb8817b6",
"build/assets/ba_data/data/languages/spanish.json": "e7f59cd89c0ebe2b7cd4c116f4d0e639",
"build/assets/ba_data/data/languages/swedish.json": "3b179e7333183c70adb0811246b09959",
"build/assets/ba_data/data/languages/tamil.json": "ead39b864228696a9b0d19344bc4b5ec",
"build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945",
"build/assets/ba_data/data/languages/turkish.json": "6153ca5248b8e4743e9501ac72378493",
"build/assets/ba_data/data/languages/thai.json": "383540a1e9c7c131ac579f51afc87471",
"build/assets/ba_data/data/languages/turkish.json": "1be60cb9d302f4f7e56d330ca2266324",
"build/assets/ba_data/data/languages/ukrainian.json": "3a5b8132690fcd583d280879876c85b7",
"build/assets/ba_data/data/languages/venetian.json": "a1315f5233ebbee1464683ac55d5d9d5",
"build/assets/ba_data/data/languages/vietnamese.json": "34a8b75acba2c0234e0b00fb4ef7d011",
@ -4099,26 +4099,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": "ab2a763986c41b05e108609e2245bc88",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "22354f5977eecb7898e8fed6a15a3471",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "5f42e62b736e12db3418740a66eaaaa6",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "3985a5b97d65f3069e78e2b864270973",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "31c224d17503059828870a65e8bc6983",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "ff368944b4df967e9ae9adca0ba2ecb6",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "2eb53cf0c1469f2de823fc37ed66e947",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "b1e608f6a95595309fcb3db40763fdc3",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "be64c41aecd2f18efc6b34c98e3c340f",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "701213f2480fcc86aabdf954d6499f42",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "c909d72602b5296d1d10d292547cf4f2",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "6ee608e0c722de648614a6d9453fa8ef",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "4564cff8a6abc34c046726c4a2f83fa1",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "0bc4cd868fd813d6a9f442f2dd38242a",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "b4ef832c06699a5b505d005057c15a18",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "d1be84a36ac1de882eeaf704e5dd4490",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "9daa986905e50270f19135279d040d90",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "a51416a1fc183a310012472a717fbb96",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "a23c0971f8b9549c7a709d72447fd47c",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "e2891d1c10f73a875e1c5efcf3006121",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "4e7664cad4f6d3cfdbc3c36a69212c28",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "babf1c525e20b35b2d12b8a0146a3d48",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "57df5ded99ad3311d760fe56411b6bd7",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "2948e12520e4071e36a071f36d8c3db0",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "313c9dfd6712f176297e926d9e4c7fe0",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "f4a28fb4d9546662238a98bd12c7b726",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "3d6221f258d42e713a347d3673b9d19a",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "4aaf560417eb9c35007d19dc8c308416",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "98170e76919fa086483ba629e1182c15",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "298e610880151538016db63f82a300e4",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "342318a5a36b4a41404801f76d870788",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "d67e36413875a741a0b9eebc91e7b21b",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "8b18faa4c38a13f294955e059a5cccb0",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "12648035ae352c3a588663489cfb89e8",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "fa43e50b3a661d7da324f27d110e9bf4",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "5b4af149f44bcfd4b73f417811c91500",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "f4757012231b8fff816a8302a435a323",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "13e55949629410b949285b15bac44a13",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "23d3d22fb9187ebbb4e05a021e3cffa4",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "3a1a99818a7dd5bb6cdd89017b56d92b",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "8c667cd77a82124b48c50630b2dd4aed",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "7e6824b45b74266c09823109b5a7069f",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "8c667cd77a82124b48c50630b2dd4aed",
@ -4135,14 +4135,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c39bcd7db4fd85f1b59855aeaf966070",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "a0abd47869e753575f06a4336659ca79",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c39bcd7db4fd85f1b59855aeaf966070",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "e77911c9d4e0dd92bfff36a506abb54a",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "558708ed8550ff325e3c40445e92fbf0",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "01222e9a53456ba1765779e2d43df195",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "0e9441acd45a6e923963477c6efcc3bd",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "37e5cf12b015c65126ebe16ff55ac70f",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "570acb3ca5c9e199e61ddaef41737aec",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "1c6f9950c4426c881ddc80d9be42a3c3",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "3fb42beee8520d8bab03535989dafa5c",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "12e6257d149d6ccad51bf6264012e41f",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "e53c04082290060b4288bf7b50fc93b7",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "fa784484b0b7af1e87c8018dccf0451b",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "399cd16520bf51854e6d45581d914607",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "4be0625f239b0478e738946d93b3062d",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "c561bd08c1c2f589e46682bb79f9b264",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "ff3b606105f73375658c5deefa90b286",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "03dc78462c9fdbb3dfd371b2f9089b70",
"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 22068, api 9, 2024-11-01)
### 1.7.37 (build 22070, api 9, 2024-11-04)
- I am pleased to announce that after years of hard work from many members of
the community, PirateSpeak is now complete and available as a language choice.
This changes everything.

2
src/assets/Makefile
View File

@ -151,6 +151,8 @@ ASSET_TARGETS_WIN_X64 += $(EXTRAS_TARGETS_WIN_X64)
# Asset Packages
ASSET_TARGETS_CMAKE += $(PROJ_DIR)/.cache/assetmanifests/gui_desktop_v2dev1
ASSET_TARGETS_WIN_WIN32 += $(PROJ_DIR)/.cache/assetmanifests/gui_desktop_v2dev1
ASSET_TARGETS_WIN_X64 += $(PROJ_DIR)/.cache/assetmanifests/gui_desktop_v2dev1
# Note: Code below needs updating when Python version changes (currently 3.11)
define make-opt-pyc-target

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 = 22068
TARGET_BALLISTICA_BUILD = 22070
TARGET_BALLISTICA_VERSION = '1.7.37'

15
src/ballistica/base/logic/logic.cc
View File

@ -554,17 +554,10 @@ void Logic::UpdateDisplayTimeForFrameDraw_() {
display_time_increment_ = display_time_increment_ + offs;
}
// If our final increment is bigger than some sane threshold, clamp it
// and try to report the conditions that caused it. We should finesse
// our math so that this never happens naturally.
const float max_increment{0.25f};
if (display_time_increment_ > max_increment) {
BA_LOG_ONCE(LogName::kBaDisplayTime, LogLevel::kWarning,
"Calced excessively large display_time_increment_ ("
+ std::to_string(display_time_increment_)
+ "); should not happen.");
display_time_increment_ = max_increment;
}
// After all is said and done, clamp our increment size to some sane
// amount. Trying to push too much through in a single instant can
// overflow thread message lists and whatnot.
display_time_increment_ = std::min(display_time_increment_, 0.25);
g_core->Log(LogName::kBaDisplayTime, LogLevel::kDebug,
[this, use_avg, this_increment, chaos, used] {

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

2
tools/batools/staging.py
View File

@ -180,6 +180,7 @@ class AssetStager:
self._parse_android_args(args)
elif platform_arg.startswith('-win'):
self.desc = 'windows'
self.asset_package_flavor = 'gui_desktop_v2dev1'
self._parse_win_args(platform_arg, args)
elif platform_arg == '-cmake':
self.desc = 'cmake'
@ -193,6 +194,7 @@ class AssetStager:
self.desc = 'cmake modular'
self.dst = args[-1]
self.tex_suffix = '.dds'
self.asset_package_flavor = 'gui_desktop_v2dev1'
self.include_python_dylib = True
self.include_shell_executable = True
self.executable_name = 'ballisticakit'