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

Latest public/internal sync.

Browse Source
This commit is contained in:
Eric 2023-11-29 16:36:34 -08:00
parent 0bd2d14622
commit 62aadc4169
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
8 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
.efrocachemap generated
View File

@ -1444,6 +1444,10 @@
"build/assets/ba_data/textures/discordLogo.ktx": "d56ab6389e2770e0601d87f99375d7a5",
"build/assets/ba_data/textures/discordLogo.pvr": "bd39785cf2cbf9bc41fdde8b86ab3310",
"build/assets/ba_data/textures/discordLogo_preview.png": "90efd54d3abd371c0150a363f3f673e7",
"build/assets/ba_data/textures/discordServer.dds": "782f63ce8bcf0de2c338ee1fbfb5df2e",
"build/assets/ba_data/textures/discordServer.ktx": "09c969fd0a278b5c426344845ef07c43",
"build/assets/ba_data/textures/discordServer.pvr": "54216467f9527c3fc2d8c777811e97a7",
"build/assets/ba_data/textures/discordServer_preview.png": "99cf0a7f77b909e9079d423a687e399f",
"build/assets/ba_data/textures/doomShroomBGColor.dds": "628100f564789f57e22f2ce0dcf53b76",
"build/assets/ba_data/textures/doomShroomBGColor.ktx": "ffbb38af60ab59e6030b01cd129bfaf9",
"build/assets/ba_data/textures/doomShroomBGColor.pvr": "77d103392813e302cdaf631cef88ba36",
@ -4056,26 +4060,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": "e1b514f894b0078ed7bd3a72219ce2a3",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "17244543e91b7be39444af42dae9b7d1",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "47bb91ce4fb7aad7e94b01a51d3ef969",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "bec653e66e25727bc96d6dac966abf41",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "1b4c041294e0d9d1990e9bed2cce718b",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "54a3cef6bc9a0118cf5ff1b0fe897981",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "7a0424345af93c7e96fd37178a101975",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "1319f01def8f006757b6ba9f99d4082d",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "517b50b6decce9ec2fbae020971c1cb1",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "a5092bc735ba18f9dc01775d2aca6de3",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "bdf0c74ece44212a80e0a54f462aba54",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "6362b3cf0bedff5bb289e23ff93cf94e",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "4fc0ad0ef28159d901cea7fc773a01f5",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "d1232f39ff8e3e0a45b2fcfe01452916",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "065cb69f2593e626f681184f772a7971",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "d92fc90d32742b00df6bd83f828c3c17",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "9edb7eefb8724c506e251ce9b6388fe8",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "8e2c1faf18f4be6b35890041ba03fdbd",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "eb29dc378b26fbdc37256f19297797ca",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "80f58bca4cd948f1ec70aac07914eae0",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "57b355cde79d0dafdd164a5e5ae9fb58",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "db9ee319aaad52441e68b4dad17cd82d",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "520583db57c9a8897d9e3423db98b6ff",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "cedf0069d323884f37348b99509e77fc",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "d19f54683d2fce5afb62c0de803231d6",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "bf067ca15c163f0ea83cb925ff3441ec",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "475bb63356600d818c148ac0ab0252d4",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "6de6e84bac4b0a7c741772fed7ea7cc4",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "af72e7fc80f45b626a56a046e3c4ac29",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "07f30ff1c00406250c4f2c0f33765739",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "48fd324d8c642ba874ebb1bce4c4af28",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "4d20a917847c4cbef8598e8ab4849132",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "8c0584e239ef05ccbb425ba8f004e41f",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "fa6186eb48cb9a068a2d77ff6d3c14d9",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "54a1708fe64c0a8d1a8dc11ee8ef3bcc",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "240728dfe915a4b95483ba13a1db9830",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "47c662ee37e717d615ae49eb5af85a0f",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "4be914a94e3cab2afb5f47eba51453e0",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "61dc6ed5e9bf02eac1a8cb9720373cd6",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "78cda4202855218a98ee800e9dd7c75a",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "c22901e06e88a55cce0b4e08bbf41a4c",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "a27963487e346338e4c216bd4fbb9e2a",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "c22901e06e88a55cce0b4e08bbf41a4c",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.30 (build 21628, api 8, 2023-11-29)
### 1.7.30 (build 21629, api 8, 2023-11-29)
- Continued work on the big 1.7.28 update.
- Got the Android version back up and running. There's been lots of cleanup and
simplification on the Android layer, cleaning out years of cruft. This should

4
src/assets/.asset_manifest_private.json
View File

@ -1465,6 +1465,10 @@
"ba_data/textures/discordLogo.ktx",
"ba_data/textures/discordLogo.pvr",
"ba_data/textures/discordLogo_preview.png",
"ba_data/textures/discordServer.dds",
"ba_data/textures/discordServer.ktx",
"ba_data/textures/discordServer.pvr",
"ba_data/textures/discordServer_preview.png",
"ba_data/textures/doomShroomBGColor.dds",
"ba_data/textures/doomShroomBGColor.ktx",
"ba_data/textures/doomShroomBGColor.pvr",

4
src/assets/Makefile
View File

@ -5710,6 +5710,7 @@ TEX2D_DDS_TARGETS = \
$(BUILD_DIR)/ba_data/textures/cyborgIcon.dds \
$(BUILD_DIR)/ba_data/textures/cyborgIconColorMask.dds \
$(BUILD_DIR)/ba_data/textures/discordLogo.dds \
$(BUILD_DIR)/ba_data/textures/discordServer.dds \
$(BUILD_DIR)/ba_data/textures/doomShroomBGColor.dds \
$(BUILD_DIR)/ba_data/textures/doomShroomLevelColor.dds \
$(BUILD_DIR)/ba_data/textures/doomShroomPreview.dds \
@ -6113,6 +6114,7 @@ TEX2D_PVR_TARGETS = \
$(BUILD_DIR)/ba_data/textures/cyborgIcon.pvr \
$(BUILD_DIR)/ba_data/textures/cyborgIconColorMask.pvr \
$(BUILD_DIR)/ba_data/textures/discordLogo.pvr \
$(BUILD_DIR)/ba_data/textures/discordServer.pvr \
$(BUILD_DIR)/ba_data/textures/doomShroomBGColor.pvr \
$(BUILD_DIR)/ba_data/textures/doomShroomLevelColor.pvr \
$(BUILD_DIR)/ba_data/textures/doomShroomPreview.pvr \
@ -6516,6 +6518,7 @@ TEX2D_KTX_TARGETS = \
$(BUILD_DIR)/ba_data/textures/cyborgIcon.ktx \
$(BUILD_DIR)/ba_data/textures/cyborgIconColorMask.ktx \
$(BUILD_DIR)/ba_data/textures/discordLogo.ktx \
$(BUILD_DIR)/ba_data/textures/discordServer.ktx \
$(BUILD_DIR)/ba_data/textures/doomShroomBGColor.ktx \
$(BUILD_DIR)/ba_data/textures/doomShroomLevelColor.ktx \
$(BUILD_DIR)/ba_data/textures/doomShroomPreview.ktx \
@ -6919,6 +6922,7 @@ TEX2D_PREVIEW_PNG_TARGETS = \
$(BUILD_DIR)/ba_data/textures/cyborgIconColorMask_preview.png \
$(BUILD_DIR)/ba_data/textures/cyborgIcon_preview.png \
$(BUILD_DIR)/ba_data/textures/discordLogo_preview.png \
$(BUILD_DIR)/ba_data/textures/discordServer_preview.png \
$(BUILD_DIR)/ba_data/textures/doomShroomBGColor_preview.png \
$(BUILD_DIR)/ba_data/textures/doomShroomLevelColor_preview.png \
$(BUILD_DIR)/ba_data/textures/doomShroomPreview_preview.png \

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
# using.
TARGET_BALLISTICA_BUILD = 21628
TARGET_BALLISTICA_BUILD = 21629
TARGET_BALLISTICA_VERSION = '1.7.30'

8
src/assets/ba_data/python/bauiv1lib/discord.py
View File

@ -95,10 +95,10 @@ class DiscordWindow(bui.Window):
parent=self._root_widget,
position=(self._width / 2 - 60, self._height - 100),
text='We have our own Discord server where you can:\n- Find new'
' friends and people to play with\n- Participate in Office'
' Hours/Coffee with Eric\n- Share mods, plugins, art, and'
' memes\n- Report bugs and make feature suggestions\n'
'- Troubleshoot issues',
' friends and people to play with\n- Participate in Office'
' Hours/Coffee with Eric\n- Share mods, plugins, art, and'
' memes\n- Report bugs and make feature suggestions\n'
'- Troubleshoot issues',
maxwidth=(self._width - 10) / 2,
color=(1, 1, 1, 1),
h_align='left',

2
src/assets/ba_data/python/bauiv1lib/gather/abouttab.py
View File

@ -133,7 +133,7 @@ class AboutGatherTab(GatherTab):
v_align='center',
flatness=1.0,
text='Want to look for new people to play with?\nJoin our Discord'
' and find new friends!',
' and find new friends!',
)
bui.buttonwidget(
parent=self._container,

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 = 21628;
const int kEngineBuildNumber = 21629;
const char* kEngineVersion = "1.7.30";
const int kEngineApiVersion = 8;