diff --git a/.efrocachemap b/.efrocachemap index bae0f7c7f..04e1122f8 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -421,9 +421,9 @@ "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": "f948f1e450a3e7aad4fa7bc6de3a5cef", + "build/assets/ba_data/data/langdata.json": "4fdebf86822ee3fea6eeab25ba579eab", "build/assets/ba_data/data/languages/arabic.json": "4a6fc46285d6289ee14a7ccd9e801ac4", - "build/assets/ba_data/data/languages/belarussian.json": "3d5523d0004293aa2df02f3f6f3b84f8", + "build/assets/ba_data/data/languages/belarussian.json": "1004e5ea10b8deaef517fd37e9309521", "build/assets/ba_data/data/languages/chinese.json": "57d199cfd2a5cf493e777dd96cc12f7c", "build/assets/ba_data/data/languages/chinesetraditional.json": "904b35b656c53f9830e406565edd5120", "build/assets/ba_data/data/languages/croatian.json": "b23619cb396ac16640c47458f884b16a", @@ -432,7 +432,7 @@ "build/assets/ba_data/data/languages/dutch.json": "734357560f53b4820221f6d60a0b79e8", "build/assets/ba_data/data/languages/english.json": "dffc4a03b94c74f11da188a7c4187eda", "build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880", - "build/assets/ba_data/data/languages/filipino.json": "69c01f1ff6783db2c43e268372719236", + "build/assets/ba_data/data/languages/filipino.json": "3d35a0594cfa0a37495cfb4a2758508a", "build/assets/ba_data/data/languages/french.json": "e0bf81cff0497dd84044442606cc878e", "build/assets/ba_data/data/languages/german.json": "c979cb1397d53a1e5b6c9a7becf83072", "build/assets/ba_data/data/languages/gibberish.json": "2efafa7c1d479ce1fa46e897739508e5", @@ -444,20 +444,20 @@ "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": "cf06347db93a2d7a5a7971554c82f8cd", + "build/assets/ba_data/data/languages/piratespeak.json": "b9fe871e6331b7178cbacbf7eb3033aa", "build/assets/ba_data/data/languages/polish.json": "89333fb207f9eb2f22fff5a95b022c35", - "build/assets/ba_data/data/languages/portuguese.json": "be6647d0000ad5dac2e8b993ef24c64a", + "build/assets/ba_data/data/languages/portuguese.json": "e1c4414fced051d2c1967417fd47650a", "build/assets/ba_data/data/languages/romanian.json": "5ae206fe0b71c4015b02b86da8931c8f", "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/spanish.json": "27f564597977b8764583a10d750900be", "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": "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/venetian.json": "abebcc38ca2655578e65428cc0dd3c45", "build/assets/ba_data/data/languages/vietnamese.json": "34a8b75acba2c0234e0b00fb4ef7d011", "build/assets/ba_data/data/maps/big_g.json": "1dd301d490643088a435ce75df971054", "build/assets/ba_data/data/maps/bridgit.json": "6aea74805f4880cc11237c5734a24422", @@ -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": "6b1e3dabaa4a8011fb76eb60bc9fc810", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "6b3ba151b5b966d8cf7f88fdf2de1cab", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "5011f48cf6abadc76782148e369cab27", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "e3f442058767c9228e22a378389adc13", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "da48f2a7825debe8d598614728adfde0", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "5a3519abac74ed1906d0200273218094", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "2acf6fb5f59604efba5259bb02e0251a", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "a80d39647b05e1dee5103d07c11e2aa6", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "dc1c2b5023400d79b3ce02a0ef80716f", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "952e688bd0ac2e3387ec7c7f8c9e51ec", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "bb61f36a89d1e9a67cc427b2cecbdec2", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "78b915a3b98cb413fb5b96d723dae285", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "130282ce0655c9939044d2a08ede2810", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "89f585bf97e7a96c4b9954ad3845e8a0", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "611431e889833f48c340225ada4adbeb", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "04a9b6676b152628698ed96083b6086c", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "53472ec7dea3e8f9fcd14efe50157145", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "76ff6d73f3d6ff0b210e7ff6bcd1313e", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "518091e3a6def818ae2b7dc7870a9d9d", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "9ac3edb0720424e7171f21e33130d174", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "c7f929ea72e941731448dd9eb1ff103c", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "69b54059d300e5af4649fc150daa745f", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "77a9cb940c68bf2f066b4816e98189ba", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "bc25c1ad96452b43ec0726bb44cbaa7d", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "c46135bff8bd128b9767d54a0fc1e3ef", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "f94f4c535a18c949325ce78c8436fc36", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "478b0ff5ea9a318c57e30afa0bff309c", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "bbc3c1084f79c764c7b795e0dd47791e", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "d80a116f33ea624fc255922e11b0e691", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "3edb93486fb92a57c8922cb069b56204", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "58b5347eaf3b22c3a289496561d91b82", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "515e4b481a8d836dd66c2c26d5a33683", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "760c4f2a06552388a6b2471153407c95", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "37fc4b306fdf241bf8f20b62b6522c07", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "7c6b02573764c31069d57b9830a49788", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "0a0fd92dabdd46ae8bd7cbe5eda1691a", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "2d5182a35948e4ab1f34c0db7abd04a8", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "88e3d75df70c5840b7574e8f4cb120f0", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "2e3b8abb31a64ac55ee0f299e44b9fc2", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "863ef09ad556227ca507d367db8808a8", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "ffa1f56e340a4c8ff4d801eca23da2e2", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "6dfd5c8a2af1118f3d756a279f95cda1", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "ffa1f56e340a4c8ff4d801eca23da2e2", @@ -4135,14 +4135,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "d371f717382406b209143c33b843aaa4", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "6fbb391cb33b40f51a3d5d9f275cc9b8", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "d371f717382406b209143c33b843aaa4", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "49b143055d3e3bb4abf0e7b72f8251cd", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "025c627d8834a3f24ee06cc4e62d5896", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "35d29b9124ac1ca56c900823316bbbd2", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "b39458a7f1300e7cd2a6a174dc8b0350", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "f4198a4df77544624b7e2180811321b6", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "7669769a1753b6aef3e8d7a573622b11", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "31ae4ace3f45941bb29b92ace4716a95", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "bc44644d4a652cc4881ac734f60bdf80", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "3b1d54bd110f234116682501398ec585", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "bfa1cf5952ab524912de7142d11c528e", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "6bb5e44746dc0e90da484c1f2a641eb3", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "5dd796d8e611242b7bae209702465710", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "6d6b34cfb5c5a3e73115a4795b033e85", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "ec77777ec5b80017b0846c084cc29cbd", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "675df177441a2317bb1f8ee61478566b", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "1f28de0b14414abe131d1694c38f9f89", "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", diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d07c3045..abbbddef5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22080, api 9, 2024-11-07) +### 1.7.37 (build 22082, api 9, 2024-11-07) - 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. diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 99acd24ea..4f78222f7 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -53,7 +53,7 @@ # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 22080 +TARGET_BALLISTICA_BUILD = 22082 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index ce774ef77..105437c4e 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -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 = 22080; +const int kEngineBuildNumber = 22082; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9; diff --git a/src/ballistica/shared/foundation/logging.cc b/src/ballistica/shared/foundation/logging.cc index 7922dc8f8..fc989f7af 100644 --- a/src/ballistica/shared/foundation/logging.cc +++ b/src/ballistica/shared/foundation/logging.cc @@ -55,6 +55,7 @@ void Logging::EmitLog(const std::string& name, LogLevel level, double timestamp, break; } char prestr[256]; + snprintf(prestr, sizeof(prestr), "%.3f %s", rel_time, name.c_str()); g_base_soft->PushDevConsolePrintCall("", 0.3f, kVector4f1); g_base_soft->PushDevConsolePrintCall( diff --git a/tools/efro/logging.py b/tools/efro/logging.py index 93df21007..189afa8b4 100644 --- a/tools/efro/logging.py +++ b/tools/efro/logging.py @@ -17,7 +17,7 @@ from threading import Thread, current_thread, Lock from efro.util import utc_now -from efro.terminal import Clr +from efro.terminal import Clr, color_enabled from efro.dataclassio import ioprepped, IOAttrs, dataclass_to_json if TYPE_CHECKING: @@ -312,6 +312,7 @@ def call_in_thread(self, call: Callable[[], Any]) -> None: @override def emit(self, record: logging.LogRecord) -> None: # pylint: disable=too-many-branches + # pylint: disable=too-many-locals if __debug__: starttime = time.monotonic() @@ -369,7 +370,19 @@ def emit(self, record: logging.LogRecord) -> None: ).strftime('%H:%M:%S') + f'.{int(record.msecs):03d}' ) - preinfo = f'{Clr.WHT}{timestamp} {record.name}:{Clr.RST} ' + + # If color printing is disabled, show level through text + # instead of color. + lvlnameex = ( + '' + if color_enabled + else f' {logging.getLevelName(record.levelno)}' + ) + + preinfo = ( + f'{Clr.WHT}{timestamp} {record.name}{lvlnameex}:' + f'{Clr.RST} ' + ) ends = LEVELNO_COLOR_CODES.get(record.levelno) if ends is not None: self._echofile.write(f'{preinfo}{ends[0]}{msg}{ends[1]}\n')