diff --git a/.efrocachemap b/.efrocachemap index fa148541..fe210e30 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -420,7 +420,7 @@ "assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/60/ad/38269b7f1c7dc20cb9a506cd0681", "assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/72/85/d6fc4d16b7081d91fba2850b5b10", "assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/e9/ae/1d674d0c086eaa0bd1c3b1db0505", - "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/36/57/76a60b261de061886357dbf2c0db", + "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/9a/eb/d3f20cfa6c8a11a49047b1723a00", "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/e2/24/5e7ea9ca5c9de4d3b7a28e53564d", "assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/61/03/89070ca765e06da3a419a579f503", "assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/f8/15/e1a2fa38697417bcf2cf19cd34ef", @@ -429,13 +429,13 @@ "assets/build/ba_data/data/languages/czech.json": "https://files.ballistica.net/cache/ba1/19/c5/7fab8fbd8c2b78bd5fc11cf6bfdd", "assets/build/ba_data/data/languages/danish.json": "https://files.ballistica.net/cache/ba1/3f/46/e4da3c1d2b0ebf916df55c608b28", "assets/build/ba_data/data/languages/dutch.json": "https://files.ballistica.net/cache/ba1/68/93/da8e9874f41a786edf52ba4ccaad", - "assets/build/ba_data/data/languages/english.json": "https://files.ballistica.net/cache/ba1/72/80/d6395c8a168558750c0d79ce769b", + "assets/build/ba_data/data/languages/english.json": "https://files.ballistica.net/cache/ba1/df/08/29edc91f648c34c3aa7960e04c13", "assets/build/ba_data/data/languages/esperanto.json": "https://files.ballistica.net/cache/ba1/4c/c7/0184b8178869d1a3827a1bfcd5bb", "assets/build/ba_data/data/languages/filipino.json": "https://files.ballistica.net/cache/ba1/e9/07/b2dc862601bcd70701b083d43279", "assets/build/ba_data/data/languages/french.json": "https://files.ballistica.net/cache/ba1/2e/48/b0a8fafc5e5436e99d9a3d697d23", "assets/build/ba_data/data/languages/german.json": "https://files.ballistica.net/cache/ba1/8a/09/3e0fa9e44913b53f4dab195d3fae", - "assets/build/ba_data/data/languages/gibberish.json": "https://files.ballistica.net/cache/ba1/8a/2a/b2bc00eed0608b2199b2bc379b2e", - "assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/e0/04/6be14bff785255719756e0906ea9", + "assets/build/ba_data/data/languages/gibberish.json": "https://files.ballistica.net/cache/ba1/08/15/13981ce51e1e9f974357a9e0a59c", + "assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/aa/da/dfc8d710af960d7300c7090faeab", "assets/build/ba_data/data/languages/hindi.json": "https://files.ballistica.net/cache/ba1/91/98/42701cd595c2f70b7484614a8f49", "assets/build/ba_data/data/languages/hungarian.json": "https://files.ballistica.net/cache/ba1/d8/f2/aa16bc336bd7660cc86c3264bfc4", "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/82/76/1ca7ba627f34be34961de40fe91f", @@ -448,7 +448,7 @@ "assets/build/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/8d/c1/90cc02326100ccee7f03d0cb42b7", "assets/build/ba_data/data/languages/serbian.json": "https://files.ballistica.net/cache/ba1/4e/91/6f2a9a3ce733908e91377a6ddb9a", "assets/build/ba_data/data/languages/slovak.json": "https://files.ballistica.net/cache/ba1/f9/4b/d9f01814224066856695452ef57c", - "assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/12/8e/8bc7f197b725da644ca4869f8854", + "assets/build/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/ce/be/2f06c3436871fd464ff3a62597d9", "assets/build/ba_data/data/languages/swedish.json": "https://files.ballistica.net/cache/ba1/91/0a/35c4baf539d5951fc03a794c0e0b", "assets/build/ba_data/data/languages/tamil.json": "https://files.ballistica.net/cache/ba1/94/1a/533bc718e676191bafc25e2dc98f", "assets/build/ba_data/data/languages/thai.json": "https://files.ballistica.net/cache/ba1/f7/df/7ba5f99c5c2c4c86fc0503fcf0b7", @@ -1446,6 +1446,10 @@ "assets/build/ba_data/textures/cyborgIconColorMask.pvr": "https://files.ballistica.net/cache/ba1/1f/70/35e302e1a91d78ab23cb3e936bde", "assets/build/ba_data/textures/cyborgIconColorMask_preview.png": "https://files.ballistica.net/cache/ba1/09/bb/e6563f614b2cda0ca5da89b80b2a", "assets/build/ba_data/textures/cyborgIcon_preview.png": "https://files.ballistica.net/cache/ba1/4e/af/0d54cad1089f73c91ed766519d77", + "assets/build/ba_data/textures/discordLogo.dds": "https://files.ballistica.net/cache/ba1/74/50/01043d907a39a088c30a8eaeab46", + "assets/build/ba_data/textures/discordLogo.ktx": "https://files.ballistica.net/cache/ba1/a2/ad/24c11330f25cd763640872fbd16e", + "assets/build/ba_data/textures/discordLogo.pvr": "https://files.ballistica.net/cache/ba1/2b/41/7b2e332fbfe4c74cc8c76be16fd0", + "assets/build/ba_data/textures/discordLogo_preview.png": "https://files.ballistica.net/cache/ba1/ad/88/2fc2f22f8ee9925df99dbc47d315", "assets/build/ba_data/textures/doomShroomBGColor.dds": "https://files.ballistica.net/cache/ba1/5c/2b/88deea7de0cf4b7e3250ca76bcc1", "assets/build/ba_data/textures/doomShroomBGColor.ktx": "https://files.ballistica.net/cache/ba1/db/35/7f5884df9de36467179b45e8e241", "assets/build/ba_data/textures/doomShroomBGColor.pvr": "https://files.ballistica.net/cache/ba1/65/5d/fc508d48f3703e91cfbfce0187ed", @@ -1614,6 +1618,10 @@ "assets/build/ba_data/textures/gameCircleIcon.ktx": "https://files.ballistica.net/cache/ba1/b3/2a/a5101200951b4349651bf32fa132", "assets/build/ba_data/textures/gameCircleIcon.pvr": "https://files.ballistica.net/cache/ba1/ff/32/be54b0eb46c48665edb0669dcf0e", "assets/build/ba_data/textures/gameCircleIcon_preview.png": "https://files.ballistica.net/cache/ba1/27/21/ddc0b407d57dd98170cbe4c54538", + "assets/build/ba_data/textures/githubLogo.dds": "https://files.ballistica.net/cache/ba1/aa/33/c411e5325264a7594eccee7a7f0f", + "assets/build/ba_data/textures/githubLogo.ktx": "https://files.ballistica.net/cache/ba1/48/0a/1244a43926b6efff0e2a6f316649", + "assets/build/ba_data/textures/githubLogo.pvr": "https://files.ballistica.net/cache/ba1/46/7a/d19365277cbc21601a023f38876b", + "assets/build/ba_data/textures/githubLogo_preview.png": "https://files.ballistica.net/cache/ba1/3e/03/0b2b3dfc5e8a779f15caa83b5240", "assets/build/ba_data/textures/gladiatorColor.dds": "https://files.ballistica.net/cache/ba1/a8/6a/2b8eb1e0f4c15993e98be5395e4c", "assets/build/ba_data/textures/gladiatorColor.ktx": "https://files.ballistica.net/cache/ba1/20/13/e491823b8cc38a52400f9d74a209", "assets/build/ba_data/textures/gladiatorColor.pvr": "https://files.ballistica.net/cache/ba1/14/60/1d4a45b0036538368348613ad01f", @@ -3995,26 +4003,26 @@ "assets/src/ba_data/python/ba/_generated/__init__.py": "https://files.ballistica.net/cache/ba1/ee/e8/cad05aa531c7faf7ff7b96db7f6e", "assets/src/ba_data/python/ba/_generated/enums.py": "https://files.ballistica.net/cache/ba1/b2/e5/0ee0561e16257a32830645239f34", "ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a", - "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/f6/09/de57f3021a373f54a2c96142d9fe", - "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d4/93/1d19eb84350ee81a13778c277dc6", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/48/a6/0ee1dad2b84fbe61da6ef2066d16", - "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/eb/0c/a1a5cb699326a0f22ce9620ee3ea", - "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/25/45/a69f1f7fb34eae8ba8f404f01d33", - "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/51/b29ad738a2a5e6d86face5f13c71", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/5f/eb/8232da71112baef95ecf1abf7286", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/8b/33/d4fc4cd67fd5ca36bdb5b8131fbc", - "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/27/a9/7119b23d17431f8982f8f5174254", - "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/8d/d6/64f2493733cfed69662d141bca9c", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/44/54/76ac28bbeaf2c1bf5d16cecb5374", - "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/3a/c5/bcff0522c26477709ad0419d6466", - "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/1b/dc/a1f1bd9c5c6fec8b84df68dc418b", - "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/1a/86/f36f6c40cbad16d4960547f94c01", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/32/3b/ffc4b9a32345d1d10905a164f9a5", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/12/5d/848ef8f14f74792148cf8b951db3", - "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/4a/3f/b90a3f24f17cfe03ed344d544896", - "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/27/53/b08fad6061c25263c68f6db01111", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/76/dd/1e50bc14fa924bc20dfe459ba764", - "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/ab/80/72db0cf98ae40a0cd4481b288bf5", + "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/c5/ff/dba67d32dc0ba6cbe6a95dd53833", + "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/28/a0/a25f7a981a452186754bc03a8fc4", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/57/08/dc80503fdf3dfb0942fd8b961c2b", + "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/35/d9/0ce2ebf8ac00cf8fb0b7bff2afed", + "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/74/4f/c681e58ee5cb4144abff585f7ad1", + "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/b8/40/06b49a4088f2e64693b6d6a04e4d", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/05/3f/372b798c3d6d1511b822ec9f75b9", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/55/4f/c560597b1e47e11694ecea752986", + "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/90/b4/41bff7ad50bc80c9a5d24f4a920f", + "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ea/09/759382dada395864c53e4c0d9a24", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/00/2d/83c3c8d03e2b28bd6781f9359081", + "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e0/5d/2af696de85a482b72df244eb292f", + "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/72/f9/590f4a3cc75bd186bc0afeeeea90", + "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a6/0e/992c11abc984b65dc009de178c8d", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cd/bf/0111833d1398a602fffb0222fe29", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/47/f8/683b182bcb67f9e092ef27bbf1a4", + "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/65/b2/39d4872153685784d505bcaa6c17", + "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/21/ed/bb41a4513660135b1a0f4e9d1b4f", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/b2/3a/da25465eba9b97e07f78ea3ace3f", + "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/c4/b1/72c0a598dceb0cd92d4c06190b08", "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/9d/a6/c963859c531bb19f507f405cf589", "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/df/dc/79349a169d3b00964d9f35853f84", "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a7/63/d057e19cb7806302b9570b91c573", @@ -4031,14 +4039,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/8b/d8/4b2e840ace5be8dd8fc9d6841cdd", "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/46/07/545eec0e6bde25bba8b3857d7e9b", "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b4/ae/d9a2b38dc9824ac6acc79d520404", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/fd/0f/93cc74583f21cb4dddf3d3cfdeef", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/25/2a/c161ffda3cf950d33dac3233c4b9", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/a6/39/cd2722b6685677329ef2c2892bf8", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/55/cc/099e9b058075fa082c63bf61da04", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/53/d8/3ed958a652a076fd1dc1bac3e275", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/85/e5/c9381f07927dbc1293aad7d949ec", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/f6/45/da2791e3cefe2771a3c7b793a49f", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/f7/3a/6904b4818c71f6e28e965b0d837f", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/b1/0f/10eeef2cec516e68c5821f55fe1c", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/46/19/b3826f960327eb7585f546c3c878", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/50/d8/1ca969ac3469fa1d1f75ea9f62b9", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/51/37/888771c771d08b32be09d9203c19", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/2f/04/0ac355606ea7f1609adf1bba693b", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/5e/87/4774a28073c2cc9e1d918977252c", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/9b/fe/f8a6cbf3ec67157fd09b66b344e7", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/54/73/160cb6f003d538aca54a4e98c531", "src/ballistica/generated/python_embedded/binding.inc": "https://files.ballistica.net/cache/ba1/c0/32/b7907e3859a5c5013a3d97b6b523", "src/ballistica/generated/python_embedded/bootstrap.inc": "https://files.ballistica.net/cache/ba1/2d/4f/f4fe67827f36cd59cd5193333a02", "src/ballistica/generated/python_embedded/bootstrap_monolithic.inc": "https://files.ballistica.net/cache/ba1/ef/c1/aa5f1aa10af89f5c0b1e616355fd" diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index 7d8742fa..02b785bb 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -1834,6 +1834,7 @@ pathsrc pathstonames pathtmp + pathwonky patsubst pausable pbrowser @@ -2856,6 +2857,8 @@ wintdir wintype wmsbe + wonkypaths + wonkysuffix woohoo woooo workdir diff --git a/CHANGELOG.md b/CHANGELOG.md index 6022450f..95163c43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.10 (build 20891, api 7, 2022-10-07) +### 1.7.10 (build 20895, api 7, 2022-10-09) - Added eval support for cloud-console. This means you can type something like '1+1' in the console and see '2' printed. This is how Python behaves in the stdin console or in-game console or the standard Python interpreter. - Exceptions in the cloud-console now print to stderr instead of logging.exception(). This means they aren't a pretty red color anymore, but this will keep cloud-console behaving well with things like servers where logging.exception() might trigger alarms or otherwise. This is also consistent with standard interactive Python behavior. - Cloud console now shows the device name at the top instead of simply 'Console' while connected. @@ -13,6 +13,7 @@ - Due to v2-transport improvements, pressing the 'End Session Now' button in ballistica.net account settings should now instantly log you out of all apps using that session (ones that are online at least). Previously this would often not take effect until something like an app relaunch. - Fixes an issue where the tournament entry window could remain stuck on top when following a 'get more tickets' link. (Thanks itsre3!) - The main menu now says 'End Test' when in a stress test instead of 'End Game' (Thanks vishal332008!) +- Added 'discordLogo' and 'githubLogo' textures for anyone who wants to use those for UIs. ### 1.7.9 (build 20880, api 7, 2022-09-24) - Cleaned up the efro.message system to isolate response types that are used purely internally (via a new SysResponse type). diff --git a/assets/.asset_manifest_private.json b/assets/.asset_manifest_private.json index 64a81070..68e5523f 100644 --- a/assets/.asset_manifest_private.json +++ b/assets/.asset_manifest_private.json @@ -1468,6 +1468,10 @@ "ba_data/textures/cyborgIconColorMask.pvr", "ba_data/textures/cyborgIconColorMask_preview.png", "ba_data/textures/cyborgIcon_preview.png", + "ba_data/textures/discordLogo.dds", + "ba_data/textures/discordLogo.ktx", + "ba_data/textures/discordLogo.pvr", + "ba_data/textures/discordLogo_preview.png", "ba_data/textures/doomShroomBGColor.dds", "ba_data/textures/doomShroomBGColor.ktx", "ba_data/textures/doomShroomBGColor.pvr", @@ -1636,6 +1640,10 @@ "ba_data/textures/gameCircleIcon.ktx", "ba_data/textures/gameCircleIcon.pvr", "ba_data/textures/gameCircleIcon_preview.png", + "ba_data/textures/githubLogo.dds", + "ba_data/textures/githubLogo.ktx", + "ba_data/textures/githubLogo.pvr", + "ba_data/textures/githubLogo_preview.png", "ba_data/textures/gladiatorColor.dds", "ba_data/textures/gladiatorColor.ktx", "ba_data/textures/gladiatorColor.pvr", diff --git a/assets/Makefile b/assets/Makefile index 07334f66..92750a22 100644 --- a/assets/Makefile +++ b/assets/Makefile @@ -5488,6 +5488,7 @@ TEX2D_DDS_TARGETS = \ build/ba_data/textures/cyborgColorMask.dds \ build/ba_data/textures/cyborgIcon.dds \ build/ba_data/textures/cyborgIconColorMask.dds \ + build/ba_data/textures/discordLogo.dds \ build/ba_data/textures/doomShroomBGColor.dds \ build/ba_data/textures/doomShroomLevelColor.dds \ build/ba_data/textures/doomShroomPreview.dds \ @@ -5530,6 +5531,7 @@ TEX2D_DDS_TARGETS = \ build/ba_data/textures/fuse.dds \ build/ba_data/textures/gameCenterIcon.dds \ build/ba_data/textures/gameCircleIcon.dds \ + build/ba_data/textures/githubLogo.dds \ build/ba_data/textures/gladiatorColor.dds \ build/ba_data/textures/gladiatorColorMask.dds \ build/ba_data/textures/gladiatorIcon.dds \ @@ -5891,6 +5893,7 @@ TEX2D_PVR_TARGETS = \ build/ba_data/textures/cyborgColorMask.pvr \ build/ba_data/textures/cyborgIcon.pvr \ build/ba_data/textures/cyborgIconColorMask.pvr \ + build/ba_data/textures/discordLogo.pvr \ build/ba_data/textures/doomShroomBGColor.pvr \ build/ba_data/textures/doomShroomLevelColor.pvr \ build/ba_data/textures/doomShroomPreview.pvr \ @@ -5933,6 +5936,7 @@ TEX2D_PVR_TARGETS = \ build/ba_data/textures/fuse.pvr \ build/ba_data/textures/gameCenterIcon.pvr \ build/ba_data/textures/gameCircleIcon.pvr \ + build/ba_data/textures/githubLogo.pvr \ build/ba_data/textures/gladiatorColor.pvr \ build/ba_data/textures/gladiatorColorMask.pvr \ build/ba_data/textures/gladiatorIcon.pvr \ @@ -6294,6 +6298,7 @@ TEX2D_KTX_TARGETS = \ build/ba_data/textures/cyborgColorMask.ktx \ build/ba_data/textures/cyborgIcon.ktx \ build/ba_data/textures/cyborgIconColorMask.ktx \ + build/ba_data/textures/discordLogo.ktx \ build/ba_data/textures/doomShroomBGColor.ktx \ build/ba_data/textures/doomShroomLevelColor.ktx \ build/ba_data/textures/doomShroomPreview.ktx \ @@ -6336,6 +6341,7 @@ TEX2D_KTX_TARGETS = \ build/ba_data/textures/fuse.ktx \ build/ba_data/textures/gameCenterIcon.ktx \ build/ba_data/textures/gameCircleIcon.ktx \ + build/ba_data/textures/githubLogo.ktx \ build/ba_data/textures/gladiatorColor.ktx \ build/ba_data/textures/gladiatorColorMask.ktx \ build/ba_data/textures/gladiatorIcon.ktx \ @@ -6697,6 +6703,7 @@ TEX2D_PREVIEW_PNG_TARGETS = \ build/ba_data/textures/cyborgColor_preview.png \ build/ba_data/textures/cyborgIconColorMask_preview.png \ build/ba_data/textures/cyborgIcon_preview.png \ + build/ba_data/textures/discordLogo_preview.png \ build/ba_data/textures/doomShroomBGColor_preview.png \ build/ba_data/textures/doomShroomLevelColor_preview.png \ build/ba_data/textures/doomShroomPreview_preview.png \ @@ -6739,6 +6746,7 @@ TEX2D_PREVIEW_PNG_TARGETS = \ build/ba_data/textures/fuse_preview.png \ build/ba_data/textures/gameCenterIcon_preview.png \ build/ba_data/textures/gameCircleIcon_preview.png \ + build/ba_data/textures/githubLogo_preview.png \ build/ba_data/textures/gladiatorColorMask_preview.png \ build/ba_data/textures/gladiatorColor_preview.png \ build/ba_data/textures/gladiatorIconColorMask_preview.png \ diff --git a/assets/src/ba_data/python/ba/_bootstrap.py b/assets/src/ba_data/python/ba/_bootstrap.py index 66fee6da..ed328ca3 100644 --- a/assets/src/ba_data/python/ba/_bootstrap.py +++ b/assets/src/ba_data/python/ba/_bootstrap.py @@ -45,7 +45,7 @@ def bootstrap() -> None: # Give a soft warning if we're being used with a different binary # version than we expect. - expected_build = 20891 + expected_build = 20895 running_build: int = env['build_number'] if running_build != expected_build: print( diff --git a/ballisticacore-cmake/.idea/dictionaries/ericf.xml b/ballisticacore-cmake/.idea/dictionaries/ericf.xml index c38c0473..80b39d36 100644 --- a/ballisticacore-cmake/.idea/dictionaries/ericf.xml +++ b/ballisticacore-cmake/.idea/dictionaries/ericf.xml @@ -980,6 +980,7 @@ pathlist pathparts pathsrc + pathwonky pausable pcommands pdataclass @@ -1490,6 +1491,8 @@ wintdir wofocj wonkiness + wonkypaths + wonkysuffix woohoo workspaceid workspacename diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index 1ed1bff5..fc908265 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -32,7 +32,7 @@ namespace ballistica { // These are set automatically via script; don't modify them here. -const int kAppBuildNumber = 20891; +const int kAppBuildNumber = 20895; const char* kAppVersion = "1.7.10"; // Our standalone globals. diff --git a/tools/batools/build.py b/tools/batools/build.py index 624cf9d8..93f2b115 100644 --- a/tools/batools/build.py +++ b/tools/batools/build.py @@ -20,41 +20,43 @@ if TYPE_CHECKING: from typing import Sequence, Any -# Python pip packages we require for this project. @dataclass -class PipRequirement: - """A pip package required by our project.""" +class PyRequirement: + """A Python package/module required by our project.""" modulename: str | None = None minversion: list[int] | None = None # None implies no min version. pipname: str | None = None # None implies same as modulename. # Note: we look directly for modules when possible instead of just pip -# entries; this accounts for manual installations or other nonstandard setups. +# entries; this accounts for manual installations or other nonstandard +# setups. -# Note 2: We can probably just replace this with a simple requirements.txt -# file, can't we? Feels like we're mostly reinventing the wheel here. -# We just need a clean way to check/list missing stuff without necessarily -# installing it. And as far as manually-installed bits, pip itself must -# have some way to allow for that, right?... -PIP_REQUIREMENTS = [ - PipRequirement(modulename='pylint', minversion=[2, 14, 5]), - PipRequirement(modulename='mypy', minversion=[0, 971]), - PipRequirement(modulename='yapf', minversion=[0, 32, 0]), - PipRequirement(modulename='cpplint', minversion=[1, 6, 1]), - PipRequirement(modulename='pytest', minversion=[7, 1, 2]), - PipRequirement(modulename='pytz'), - PipRequirement(modulename='ansiwrap'), - PipRequirement(modulename='yaml', pipname='PyYAML'), - PipRequirement(modulename='requests'), - PipRequirement(modulename='pdoc'), - PipRequirement(pipname='typing_extensions', minversion=[4, 3, 0]), - PipRequirement(pipname='types-filelock', minversion=[3, 2, 7]), - PipRequirement(pipname='types-requests', minversion=[2, 28, 9]), - PipRequirement(pipname='types-pytz', minversion=[2022, 2, 1, 0]), - PipRequirement(pipname='types-PyYAML', minversion=[6, 0, 11]), - PipRequirement(pipname='certifi', minversion=[2022, 6, 15]), - PipRequirement(pipname='types-certifi', minversion=[2021, 10, 8, 3]), +# Note 2: That is probably overkill. We can probably just replace +# this with a simple requirements.txt file, can't we? Feels like we're +# mostly reinventing the wheel here. We just need a clean way to +# check/list missing stuff without necessarily installing it. And as far +# as manually-installed bits, pip itself must have some way to allow for +# that, right?... +PY_REQUIREMENTS = [ + PyRequirement(modulename='pylint', minversion=[2, 14, 5]), + PyRequirement(modulename='mypy', minversion=[0, 971]), + PyRequirement(modulename='yapf', minversion=[0, 32, 0]), + PyRequirement(modulename='cpplint', minversion=[1, 6, 1]), + PyRequirement(modulename='pytest', minversion=[7, 1, 2]), + PyRequirement(modulename='pytz'), + PyRequirement(modulename='ansiwrap'), + PyRequirement(modulename='yaml', pipname='PyYAML'), + PyRequirement(modulename='requests'), + PyRequirement(modulename='pdoc'), + PyRequirement(pipname='black', minversion=[22, 10, 0]), + PyRequirement(pipname='typing_extensions', minversion=[4, 3, 0]), + PyRequirement(pipname='types-filelock', minversion=[3, 2, 7]), + PyRequirement(pipname='types-requests', minversion=[2, 28, 9]), + PyRequirement(pipname='types-pytz', minversion=[2022, 2, 1, 0]), + PyRequirement(pipname='types-PyYAML', minversion=[6, 0, 11]), + PyRequirement(pipname='certifi', minversion=[2022, 6, 15]), + PyRequirement(pipname='types-certifi', minversion=[2021, 10, 8, 3]), ] # Parts of full-tests suite we only run on particular days. @@ -555,7 +557,7 @@ def checkenv() -> None: # Check for some required python modules. # FIXME: since all of these come from pip now, we should just use # pip --list to check versions on everything instead of doing it ad-hoc. - for req in PIP_REQUIREMENTS: + for req in PY_REQUIREMENTS: try: modname = req.modulename minver = req.minversion @@ -650,7 +652,7 @@ def checkenv() -> None: def get_pip_reqs() -> list[str]: """Return the pip requirements needed to build/run stuff.""" out: list[str] = [] - for req in PIP_REQUIREMENTS: + for req in PY_REQUIREMENTS: name = req.modulename if req.pipname is None else req.pipname assert isinstance(name, str) out.append(name) diff --git a/tools/efro/error.py b/tools/efro/error.py index e1045580..6b4853bb 100644 --- a/tools/efro/error.py +++ b/tools/efro/error.py @@ -128,6 +128,15 @@ def is_urllib_communication_error(exc: BaseException, url: str | None) -> bool: return False +def is_requests_communication_error(exc: BaseException) -> bool: + """Is the provided exception a communication-related error from requests? + """ + import requests + + # Looks like this maps pretty well onto requests' ConnectionError + return isinstance(exc, requests.ConnectionError) + + def is_udp_communication_error(exc: BaseException) -> bool: """Should this udp-related exception be considered a communication error? diff --git a/tools/efrotools/code.py b/tools/efrotools/code.py index 47311a80..dd793d5c 100644 --- a/tools/efrotools/code.py +++ b/tools/efrotools/code.py @@ -167,6 +167,19 @@ def get_code_filenames(projroot: Path) -> list[str]: return codefilenames +def black_base_args() -> list[str]: + """Build base args for running black Python formatting.""" + from efrotools import PYVER + pyver = PYVER.replace('.', '') + if len(pyver) != 3: + raise RuntimeError('Py version filtering err.') + + return [ + f'python{PYVER}', '-m', 'black', '--target-version', pyver, + '--line-length', '80', '--skip-string-normalization' + ] + + def format_project_python_files(projroot: Path, full: bool) -> None: """Runs yapf on all of our Python code.""" import time