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

Latest public/internal sync.

Browse Source
This commit is contained in:
Eric 2024-03-14 15:52:19 -07:00
parent f62d0e26e0
commit c7140928c5
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.efrocachemap generated
View File

@ -4077,10 +4077,10 @@
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "824bac953cbe94f1f5a5bc714cc139a0",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "7909565c7d5a006f2fdd2bced6cca2ba",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "64dd34b2fedb26c9890c509d1bc81531",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "df7d4ca2e5e1112c467635ce90bbb198",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "3790fd6da37a7f3e2d263121ca52609f",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "dd8e29d218b374975e7981a4ef9510f1",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "bbe238d97fcc1ddb0d4a094ce3affc04",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "81715033a6c84ed74f466039ab9ab20c",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "b66e192c7612a44c9cdc3db0e4e14f20",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "376c6de8f7e59cfbecdb5c56a001f290",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "d883162ad60ccc023148fc98fef64e42",
"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_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
@ -4097,14 +4097,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "fbdc80e41c5883b4a893d2f0786e377f",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "1dfca87081151b7e5a06442214253dd5",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "b940b29384c69fd72a36b850d169c026",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "bb66949717079167eec996e90ef69585",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "46fcd10d6fea36f51f61d6a11ea94e16",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "12ae5b092aef3ea1770586f8f5d34a00",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "374d9852e5489ece98043ee62fff9b4b",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "ef51d5e45ebb0d53da0bb1f901f03129",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "e796ef2416394cd133bb5f52f8e0f6a2",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "ceaca4c52ec11ea05a726d0f61c6c2ef",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "67c820bcbc296e3806504a0c26a3d251",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "ad2ee8752e52ba99f5c8bdf8e8fd368c",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "9cd95ef02c5fbe4d7c397899f88e0d46",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "202e5d5c0711310a91836f041177c8a4",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "1ad97b1a5fdff1de4f0fb4be70cf4584",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "767f1b629915507ef4b70f5afcc7a305",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "8021df36d1dccf0ee46eb7d7399ff1ca",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f",

5
src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py
View File

@ -232,9 +232,8 @@ class PlayerSpaz(Spaz):
)
# Leaving the game doesn't count as a kill *unless*
# someone does it intentionally while being attacked.
left_game_cleanly = (
msg.how is bs.DeathType.LEFT_GAME
and not (was_held or was_attacked_recently)
left_game_cleanly = msg.how is bs.DeathType.LEFT_GAME and not (
was_held or was_attacked_recently
)
killed = not (msg.immediate or left_game_cleanly)

13
src/assets/ba_data/python/bauiv1lib/colorpicker.py
View File

@ -321,7 +321,7 @@ class ColorPickerExact(PopupWindow):
hexcolor = hex_to_color(hextext)
if len(hexcolor) == 4:
r, g, b, a = hexcolor
del a # unused
del a # unused
else:
r, g, b = hexcolor
# Replace the color!
@ -426,14 +426,15 @@ def hex_to_color(hex_color: str) -> tuple:
(int.from_bytes(bytes.fromhex(hex_color[0:2]))),
(int.from_bytes(bytes.fromhex(hex_color[2:4]))),
(int.from_bytes(bytes.fromhex(hex_color[4:6]))),
(int.from_bytes(bytes.fromhex(hex_color[6:8])))
if hexlength == 8
else None,
(
(int.from_bytes(bytes.fromhex(hex_color[6:8])))
if hexlength == 8
else None
),
)
# Divide all numbers by 255 and return.
nr, ng, nb, na = (
x / 255 if x is not None
else None for x in (ar, ag, ab, aa)
x / 255 if x is not None else None for x in (ar, ag, ab, aa)
)
return (nr, ng, nb, na) if aa is not None else (nr, ng, nb)