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

temp disabling discord button due to breakage on small screen size - will fix tomorrow

Browse Source
This commit is contained in:
Eric 2023-11-29 17:06:01 -08:00
parent 62aadc4169
commit e348c7f751
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
6 changed files with 63 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.efrocachemap generated
View File

@ -4060,26 +4060,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": "57b355cde79d0dafdd164a5e5ae9fb58", "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "d1b736e6185c6a77cabad635afe97d1c",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "db9ee319aaad52441e68b4dad17cd82d", "build/prefab/full/linux_arm64_gui/release/ballisticakit": "93c74c5b4f9b7f528b0802aa7a23f677",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "520583db57c9a8897d9e3423db98b6ff", "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "36cba560a8171836dd7c9c6ff0ef9218",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "cedf0069d323884f37348b99509e77fc", "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "6e1d80e717d34d8594588d22a002e8f9",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "d19f54683d2fce5afb62c0de803231d6", "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "36a88b7c6b86f1acdd32ee4651496297",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "bf067ca15c163f0ea83cb925ff3441ec", "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "86399e9fed0bd310390595036e5a2567",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "475bb63356600d818c148ac0ab0252d4", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "f359b4e02f83e4aa04d7d0165b864de8",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "6de6e84bac4b0a7c741772fed7ea7cc4", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "e244e4b6e699ccf65ccde669153290df",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "af72e7fc80f45b626a56a046e3c4ac29", "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "d31b4e34e21c25455380afa50ecf0fe7",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "07f30ff1c00406250c4f2c0f33765739", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "3d1d0b4dd7df23c3c7e9958286211229",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "48fd324d8c642ba874ebb1bce4c4af28", "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "de5e043bf03efece2aa8a9ab3362749e",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "4d20a917847c4cbef8598e8ab4849132", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "3bd9856b27825995919c9d0bbe6809cb",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "8c0584e239ef05ccbb425ba8f004e41f", "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "4e58688f6d42481fa175d6f0d43f8ab7",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "fa6186eb48cb9a068a2d77ff6d3c14d9", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "a05c25cdef7d3e81067c9645136a7b77",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "54a1708fe64c0a8d1a8dc11ee8ef3bcc", "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "5501e98f9cea647b25a3702e26da5b31",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "240728dfe915a4b95483ba13a1db9830", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "8ef08bf21aeef91beecce31b79661a1a",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "47c662ee37e717d615ae49eb5af85a0f", "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "51318d5ab8b474a01466eed83b8d9553",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "4be914a94e3cab2afb5f47eba51453e0", "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "ea7ab32e245bb804cd09c9d111a7c10b",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "61dc6ed5e9bf02eac1a8cb9720373cd6", "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "caabdfd17f1df3608a68cc96315ed4d5",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "78cda4202855218a98ee800e9dd7c75a", "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "8a9ed3e4672af09f5ea1b81d59dfb84f",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "c22901e06e88a55cce0b4e08bbf41a4c", "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_gui/release/libballisticaplus.a": "a27963487e346338e4c216bd4fbb9e2a",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "c22901e06e88a55cce0b4e08bbf41a4c", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "c22901e06e88a55cce0b4e08bbf41a4c",

2
CHANGELOG.md
View File

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

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 = 21629 TARGET_BALLISTICA_BUILD = 21630
TARGET_BALLISTICA_VERSION = '1.7.30' TARGET_BALLISTICA_VERSION = '1.7.30'

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

@ -88,7 +88,7 @@ class DiscordWindow(bui.Window):
parent=self._root_widget, parent=self._root_widget,
position=(40, -15), position=(40, -15),
size=(min_size, min_size), size=(min_size, min_size),
texture=bui.gettexture('discordPreview'), texture=bui.gettexture('discordServer'),
) )
bui.textwidget( bui.textwidget(

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

@ -29,6 +29,8 @@ class AboutGatherTab(GatherTab):
region_left: float, region_left: float,
region_bottom: float, region_bottom: float,
) -> bui.Widget: ) -> bui.Widget:
# pylint: disable=too-many-locals
plus = bui.app.plus plus = bui.app.plus
assert plus is not None assert plus is not None
@ -59,11 +61,13 @@ class AboutGatherTab(GatherTab):
) )
string_height = 400 string_height = 400
include_invite = True include_invite = True
include_discord = False # Need to fix spacing on small first.
msc_scale = 1.1 msc_scale = 1.1
c_height_2 = min(region_height, string_height * msc_scale + 100) c_height_2 = min(region_height, string_height * msc_scale + 100)
try_tickets = plus.get_v1_account_misc_read_val( try_tickets = plus.get_v1_account_misc_read_val(
'friendTryTickets', None 'friendTryTickets', None
) )
if try_tickets is None: if try_tickets is None:
include_invite = False include_invite = False
self._container = bui.containerwidget( self._container = bui.containerwidget(
@ -74,7 +78,7 @@ class AboutGatherTab(GatherTab):
), ),
size=(region_width, c_height_2), size=(region_width, c_height_2),
background=False, background=False,
selectable=include_invite, selectable=include_invite or include_discord,
) )
bui.widget(edit=self._container, up_widget=tab_button) bui.widget(edit=self._container, up_widget=tab_button)
@ -94,7 +98,7 @@ class AboutGatherTab(GatherTab):
if include_invite: if include_invite:
bui.textwidget( bui.textwidget(
parent=self._container, parent=self._container,
position=(region_width * 0.57, 85), position=(region_width * 0.57, 35),
color=(0, 1, 0), color=(0, 1, 0),
scale=0.6, scale=0.6,
size=(0, 0), size=(0, 0),
@ -107,9 +111,9 @@ class AboutGatherTab(GatherTab):
subs=[('${COUNT}', str(try_tickets))], subs=[('${COUNT}', str(try_tickets))],
), ),
) )
bui.buttonwidget( invite_button = bui.buttonwidget(
parent=self._container, parent=self._container,
position=(region_width * 0.59, 60), position=(region_width * 0.59, 10),
size=(230, 50), size=(230, 50),
color=(0.54, 0.42, 0.56), color=(0.54, 0.42, 0.56),
textcolor=(0, 1, 0), textcolor=(0, 1, 0),
@ -121,31 +125,38 @@ class AboutGatherTab(GatherTab):
on_activate_call=bui.WeakCall(self._invite_to_try_press), on_activate_call=bui.WeakCall(self._invite_to_try_press),
up_widget=tab_button, up_widget=tab_button,
) )
else:
invite_button = None
bui.textwidget( if include_discord:
parent=self._container, bui.textwidget(
position=(region_width * 0.57, 15 if include_invite else 75), parent=self._container,
color=(0.6, 0.6, 1), position=(region_width * 0.57, 15 if include_invite else 75),
scale=0.6, color=(0.6, 0.6, 1),
size=(0, 0), scale=0.6,
maxwidth=region_width * 0.5, size=(0, 0),
h_align='right', maxwidth=region_width * 0.5,
v_align='center', h_align='right',
flatness=1.0, v_align='center',
text='Want to look for new people to play with?\nJoin our Discord' flatness=1.0,
' and find new friends!', text=(
) 'Want to look for new people to play with?\n'
bui.buttonwidget( 'Join our Discord and find new friends!'
parent=self._container, ),
position=(region_width * 0.59, -10 if include_invite else 50), )
size=(230, 50), bui.buttonwidget(
color=(0.54, 0.42, 0.56), parent=self._container,
textcolor=(0.6, 0.6, 1), position=(region_width * 0.59, -10 if include_invite else 50),
label='Join The Discord', size=(230, 50),
autoselect=True, color=(0.54, 0.42, 0.56),
on_activate_call=bui.WeakCall(self._join_the_discord_press), textcolor=(0.6, 0.6, 1),
up_widget=tab_button, label='Join The Discord',
) autoselect=True,
on_activate_call=bui.WeakCall(self._join_the_discord_press),
up_widget=(
invite_button if invite_button is not None else tab_button
),
)
return self._container return self._container

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