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

pr tidying

Browse Source
This commit is contained in:
Eric 2024-03-13 14:33:44 -07:00
parent 222f28e626
commit 9a292ee751
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
.efrocachemap generated
View File

@ -421,8 +421,8 @@
"build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26", "build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26",
"build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8", "build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8",
"build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55", "build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55",
"build/assets/ba_data/data/langdata.json": "66f05313ffa9880373066332cff4594c", "build/assets/ba_data/data/langdata.json": "0d9f610cd2284cad4316cc2cb131a08b",
"build/assets/ba_data/data/languages/arabic.json": "0db32e21b6d5337ccca478381744aa88", "build/assets/ba_data/data/languages/arabic.json": "2c2915e10124bb8f69206da9c608d57c",
"build/assets/ba_data/data/languages/belarussian.json": "09954e550d13d3d9cb5a635a1d32a151", "build/assets/ba_data/data/languages/belarussian.json": "09954e550d13d3d9cb5a635a1d32a151",
"build/assets/ba_data/data/languages/chinese.json": "bb51b5aa614830c561e8fe2542a9ab8a", "build/assets/ba_data/data/languages/chinese.json": "bb51b5aa614830c561e8fe2542a9ab8a",
"build/assets/ba_data/data/languages/chinesetraditional.json": "319565f8a15667488f48dbce59278e39", "build/assets/ba_data/data/languages/chinesetraditional.json": "319565f8a15667488f48dbce59278e39",
@ -430,22 +430,22 @@
"build/assets/ba_data/data/languages/czech.json": "15be4fd59895135bad0265f79b362d5b", "build/assets/ba_data/data/languages/czech.json": "15be4fd59895135bad0265f79b362d5b",
"build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7", "build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7",
"build/assets/ba_data/data/languages/dutch.json": "b0900d572c9141897d53d6574c471343", "build/assets/ba_data/data/languages/dutch.json": "b0900d572c9141897d53d6574c471343",
"build/assets/ba_data/data/languages/english.json": "6501b04faba1d81e26725dfa19b15667", "build/assets/ba_data/data/languages/english.json": "0a95fdbc1564161bc7c8b419b0c03651",
"build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880", "build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880",
"build/assets/ba_data/data/languages/filipino.json": "fe3f1efcb47efaa23524300d21728933", "build/assets/ba_data/data/languages/filipino.json": "5226bf247fa1c8f4406360644f3fa15f",
"build/assets/ba_data/data/languages/french.json": "917e4174d6f0eb7f00c27fd79cfbb924", "build/assets/ba_data/data/languages/french.json": "917e4174d6f0eb7f00c27fd79cfbb924",
"build/assets/ba_data/data/languages/german.json": "450fa41ae264f29a5d1af22143d0d0ad", "build/assets/ba_data/data/languages/german.json": "450fa41ae264f29a5d1af22143d0d0ad",
"build/assets/ba_data/data/languages/gibberish.json": "0c1c4ac59d82a58c4b89328d44510d72", "build/assets/ba_data/data/languages/gibberish.json": "5533873020e51186beb2f209adbbfb08",
"build/assets/ba_data/data/languages/greek.json": "287c0ec437b38772284ef9d3e4fb2fc3", "build/assets/ba_data/data/languages/greek.json": "287c0ec437b38772284ef9d3e4fb2fc3",
"build/assets/ba_data/data/languages/hindi.json": "90f54663e15d85a163f1848a8e9d8d07", "build/assets/ba_data/data/languages/hindi.json": "90f54663e15d85a163f1848a8e9d8d07",
"build/assets/ba_data/data/languages/hungarian.json": "796a290a8c44a1e7635208c2ff5fdc6e", "build/assets/ba_data/data/languages/hungarian.json": "796a290a8c44a1e7635208c2ff5fdc6e",
"build/assets/ba_data/data/languages/indonesian.json": "9103845242b572aa8ba48e24f81ddb68", "build/assets/ba_data/data/languages/indonesian.json": "9103845242b572aa8ba48e24f81ddb68",
"build/assets/ba_data/data/languages/italian.json": "fc6440be9ba1846172cf5e11df617c05", "build/assets/ba_data/data/languages/italian.json": "55c350f8f5039802138ffc1013f14ed3",
"build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597", "build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597",
"build/assets/ba_data/data/languages/malay.json": "832562ce997fc70704b9234c95fb2e38", "build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f",
"build/assets/ba_data/data/languages/persian.json": "c4144aebf2900fc655860de891d16f83", "build/assets/ba_data/data/languages/persian.json": "07eddcf92d3dcc7a745ea74e2b0007c8",
"build/assets/ba_data/data/languages/polish.json": "9d22c6643c097c4cb268d0d6b6319cd4", "build/assets/ba_data/data/languages/polish.json": "9d22c6643c097c4cb268d0d6b6319cd4",
"build/assets/ba_data/data/languages/portuguese.json": "b52164747c6308fc9d054eb6c0ff3c54", "build/assets/ba_data/data/languages/portuguese.json": "a48df1d11a088a1a2e6e3f66627444be",
"build/assets/ba_data/data/languages/romanian.json": "b3e46efd6f869dbd78014570e037c290", "build/assets/ba_data/data/languages/romanian.json": "b3e46efd6f869dbd78014570e037c290",
"build/assets/ba_data/data/languages/russian.json": "0590f49889616b5279be569dea926e17", "build/assets/ba_data/data/languages/russian.json": "0590f49889616b5279be569dea926e17",
"build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69", "build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69",
@ -456,7 +456,7 @@
"build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945", "build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945",
"build/assets/ba_data/data/languages/turkish.json": "db71f3776072b7a15ef37b1bb1245795", "build/assets/ba_data/data/languages/turkish.json": "db71f3776072b7a15ef37b1bb1245795",
"build/assets/ba_data/data/languages/ukrainian.json": "3d75d21205c82db34fb1a1b014592747", "build/assets/ba_data/data/languages/ukrainian.json": "3d75d21205c82db34fb1a1b014592747",
"build/assets/ba_data/data/languages/venetian.json": "f896fc3df13a42f1bef8813ca80b1a09", "build/assets/ba_data/data/languages/venetian.json": "035034e0b4de696a41bf753ab4d0e194",
"build/assets/ba_data/data/languages/vietnamese.json": "921cd1e50f60fe3e101f246e172750ba", "build/assets/ba_data/data/languages/vietnamese.json": "921cd1e50f60fe3e101f246e172750ba",
"build/assets/ba_data/data/maps/big_g.json": "1dd301d490643088a435ce75df971054", "build/assets/ba_data/data/maps/big_g.json": "1dd301d490643088a435ce75df971054",
"build/assets/ba_data/data/maps/bridgit.json": "6aea74805f4880cc11237c5734a24422", "build/assets/ba_data/data/maps/bridgit.json": "6aea74805f4880cc11237c5734a24422",
@ -4061,26 +4061,26 @@
"build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1",
"build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae",
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "e3491a98d783a20840de1b304d77dfd9", "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "0adaa97f06c71b4d5ecf1244f31b31a0",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "10bb7829422d4b8686a7d8442ba049bb", "build/prefab/full/linux_arm64_gui/release/ballisticakit": "c3a44ad6d644fcc11c1c17cca78a9683",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "1fd0d2af73a8a825707189f6781df44b", "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "7fa63daf02f12a877fce88796d0fa16b",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "4f9da476e52ba1b70578ffefb6387dc5", "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "a5e9efc37aac09f3d961e233f624c37e",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "41afaca968994080fd5756a99968c518", "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "3807dfda15eb47f36cde6ba4fdad810c",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "d274844bc22a695d1ab75855dfa9313d", "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "cb4f0c84e9a695087140e98a957ad193",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "320c18e3900246441164f3fc0f50c76e", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "4ff147e94388b4ed45f7ed771eb02af3",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "f576f7e4a29ce0c1b3c1fee330a087e8", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "716753bc3f3f3fb001be14833055433e",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "ec8be3716a4636e4c4ea99100bb173a0", "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "2c1d35e8e0275ef7a2f468c515458f16",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "16b2a238064d00b98bde534d888f3012", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "41869b7dfa7178146ff67319b150360f",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "ee6c80a56994a0be5e377474ccf077b2", "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "fe1ff961030f70bf9c4762479d45d610",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "eff2828ae6de6bdadaa97b1c28d393cd", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ebe56ba80f8964ce975ab2f46a7146ac",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "fb9e882b485aa79a440158f8d5d27b7b", "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "5ee03273e0c1ea2833874a14cbbae2b6",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "697fdd2e9baf6e5a39f25780ac401305", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "9812d5fc870125cdfddfd042d43aa651",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "82e85a85697829b68b2c7767ea36fadf", "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "eb5e2e2d1d06063399c6a8fa54c85e79",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "1e2ff43543c81114d90a0854b58e6c9f", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "d028662a1d8b69fb18078cc97d29f47c",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "abc4bb20768498174019ee34ac0d8fed", "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "16777476e77ebe7b0b54cfbfeda6e2bb",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "f5059d9384e36e4a01a69f57c9f0bf40", "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "af85ac685e3301589ebf381c8de404d0",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "71f5fb174030e954fe8fce5c67f090a3", "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "b61c84b240cb35247863397a30532725",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "e8d8d8991d2df40dfe4f9a0e167d22ce", "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "c23d4f6ec76e7c8721d112c4f92328a8",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",

4
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.33 (build 21776, api 8, 2024-03-13) ### 1.7.33 (build 21777, api 8, 2024-03-13)
- Stress test input-devices are now a bit smarter; they won't press any buttons - Stress test input-devices are now a bit smarter; they won't press any buttons
while UIs are up (this could cause lots of chaos if it happened). while UIs are up (this could cause lots of chaos if it happened).
- Added a 'Show Demos When Idle' option in advanced settings. If enabled, the - Added a 'Show Demos When Idle' option in advanced settings. If enabled, the
@ -36,6 +36,8 @@
EraOSBeta!) EraOSBeta!)
- Added a UI for customizing Series Length in Teams and Points-to-Win in FFA - Added a UI for customizing Series Length in Teams and Points-to-Win in FFA
(Thanks EraOSBeta!) (Thanks EraOSBeta!)
- Sphinx based Python documentation generation is now wired up (Thanks
Loup-Garou911XD!)
- Renaming & overwriting existing profiles is no longer possible (Thanks Temp!) - Renaming & overwriting existing profiles is no longer possible (Thanks Temp!)
### 1.7.32 (build 21741, api 8, 2023-12-20) ### 1.7.32 (build 21741, api 8, 2023-12-20)

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

@ -52,7 +52,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be # Build number and version of the ballistica binary we expect to be
# using. # using.
TARGET_BALLISTICA_BUILD = 21776 TARGET_BALLISTICA_BUILD = 21777
TARGET_BALLISTICA_VERSION = '1.7.33' TARGET_BALLISTICA_VERSION = '1.7.33'

6
src/assets/ba_data/python/bauiv1lib/profile/edit.py
View File

@ -804,12 +804,8 @@ class EditProfileWindow(bui.Window):
# Make sure we're not renaming to another existing profile. # Make sure we're not renaming to another existing profile.
profiles: dict = bui.app.config.get('Player Profiles', {}) profiles: dict = bui.app.config.get('Player Profiles', {})
if self._existing_profile != new_name and new_name in profiles.keys(): if self._existing_profile != new_name and new_name in profiles.keys():
# NOTE: Implement a new LSTR!
bui.screenmessage( bui.screenmessage(
bui.Lstr( bui.Lstr(resource='editProfileWindow.profileAlreadyExistsText')
resource='nameDuplicateText',
fallback_value='Cannot rename to existing profile!',
)
) )
bui.getsound('error').play() bui.getsound('error').play()
return False return False

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

@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
namespace ballistica { namespace ballistica {
// These are set automatically via script; don't modify them here. // These are set automatically via script; don't modify them here.
const int kEngineBuildNumber = 21776; const int kEngineBuildNumber = 21777;
const char* kEngineVersion = "1.7.33"; const char* kEngineVersion = "1.7.33";
const int kEngineApiVersion = 8; const int kEngineApiVersion = 8;