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

tidying

Browse Source
This commit is contained in:
Eric 2024-01-05 16:03:46 -08:00
parent 9b6144a0f1
commit be47de516a
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
19 changed files with 23 additions and 55 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/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae",
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "a7db473017fa13d1212e9587b4bda76a",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "8ce62f899f97c32ca7352512d130c94d",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "20a42bb622efc117843164631209a38a",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "09ef551b00bda642f2e9ffd3df829528",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "f95382d735042cacc0a9b9169898eef6",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "034c45f3d8475443e3f08a8804d50c54",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "9a5a758e249512689c2636eb95c800da",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "5b35fd7bd9478df81bea9ae933f6626c",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "9b07d0576ef0210932802834ffd1e906",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "4909af00548787703b22c9378c5d55c4",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "c3015bdc3c96b6113fcd8b788de2e8f1",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "e9346722a61a9235689cd4a7584fd3f4",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "50553482d627914284738077865bba4e",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "433684a6d7a9c6d3e1e34fb7fde85233",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "2ae2760397e99d9f559cb5b9001f99ee",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "77005ff5b5551959f3666ce463b0c26e",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "86f40d9912c007bdcb422de528b79a6a",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "aafe6d208f5cbfd751ade57e434771e4",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "e7fe163c28bbc62ecf211a670cd63a0e",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "02c785d636aec2bf65250f3cb7f28f85",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "d21914011f1e77a976b148a5b8c69dce",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "cf5237fcf915d7d8d821a258f50ca179",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "3af7cbd5537179db4d40ba9716fff2b8",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "9fd2409a3903b751d48fc660f9e70099",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "0cca04e822b4238d8a1e850cc6a94ed1",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "523227d51e692d79de1cd69cadb1f8aa",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "59a7745669408160aa43610422e41359",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "d8c3b8fe1f6d16e576109094a4d5b53b",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "08210135eacec59cb41dd722ae626f77",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "31dded01891017b46eaa0f6bd75e0f7f",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "6329a6bd805d4915224b754a9865c579",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ff9c7e8e7883aa2016fa25775baefd26",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "34b828fbe4977b19430ba0a95ca50458",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "8a65ad46eb98595295c9c068ea5e7775",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "3320556d000c66d23f8011abab1eb0cb",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "0e3b251bf6c965314a8cc4d306f2448b",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "feb05d9807f54cc40e4cbeab373de79d",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "ee822a29b6f63c1375be7045b82543eb",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "487a8d7e6a25ad423b846ecc47bfafec",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "a4d3bf9e4660df50ba66564df0bf0e13",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "db535f0ca1e01af825f75f204fbc8928",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "97d51afca996ae15b61fd9f409a00459",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "db535f0ca1e01af825f75f204fbc8928",

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.33 (build 21754, api 8, 2024-01-05)
### 1.7.33 (build 21755, api 8, 2024-01-05)
- 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).
- Added a 'Show Demos When Idle' option in advanced settings. If enabled, the

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 = 21754
TARGET_BALLISTICA_BUILD = 21755
TARGET_BALLISTICA_VERSION = '1.7.33'

11
src/assets/ba_data/python/bauiv1lib/mainmenu.py
View File

@ -70,7 +70,6 @@ class MainMenuWindow(bui.Window):
self._how_to_play_button: bui.Widget | None = None
self._credits_button: bui.Widget | None = None
self._settings_button: bui.Widget | None = None
self._pause_and_resume_image: bui.Widget | None = None
self._next_refresh_allow_time = 0.0
self._store_char_tex = self._get_store_char_tex()
@ -527,16 +526,6 @@ class MainMenuWindow(bui.Window):
autoselect=True,
on_activate_call=bui.Call(self._pause_or_resume_replay),
)
# self._pause_and_resume_image = bui.imagewidget(
# parent=self._root_widget,
# size=(b_size, b_size),
# draw_controller=btn,
# position=(h - b_size * 0.47,
# v - b_size - b_buffer_2 + v_offs),
# texture=bui.gettexture(
# 'pauseIcon' if bs.is_replay_paused() else 'resumeIcon'
# ),
# )
def _refresh_not_in_game(
self, positions: list[tuple[float, float, float]]

4
src/ballistica/base/app_adapter/app_adapter.cc
View File

@ -4,12 +4,8 @@
#include "ballistica/base/graphics/renderer/renderer.h"
#include "ballistica/base/input/input.h"
#include "ballistica/base/networking/network_reader.h"
#include "ballistica/base/networking/networking.h"
#include "ballistica/base/python/base_python.h"
#include "ballistica/base/support/app_config.h"
#include "ballistica/base/ui/ui.h"
#include "ballistica/shared/foundation/event_loop.h"
namespace ballistica::base {

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

@ -16,12 +16,10 @@
#include "ballistica/base/networking/network_reader.h"
#include "ballistica/base/networking/network_writer.h"
#include "ballistica/base/networking/networking.h"
#include "ballistica/base/platform/base_platform.h"
#include "ballistica/base/python/base_python.h"
#include "ballistica/base/python/class/python_class_feature_set_data.h"
#include "ballistica/base/python/support/python_context_call.h"
#include "ballistica/base/support/app_config.h"
#include "ballistica/base/support/app_timer.h"
#include "ballistica/base/support/base_build_switches.h"
#include "ballistica/base/support/huffman.h"
#include "ballistica/base/support/plus_soft.h"

1
src/ballistica/base/input/device/keyboard_input.cc
View File

@ -3,7 +3,6 @@
#include "ballistica/base/input/device/keyboard_input.h"
#include "ballistica/base/app_adapter/app_adapter.h"
#include "ballistica/base/platform/base_platform.h"
#include "ballistica/base/support/classic_soft.h"
#include "ballistica/base/support/repeater.h"
#include "ballistica/base/ui/ui.h"

1
src/ballistica/base/input/device/test_input.cc
View File

@ -5,7 +5,6 @@
#include "ballistica/base/input/device/joystick_input.h"
#include "ballistica/base/input/input.h"
#include "ballistica/base/ui/ui.h"
#include "ballistica/core/platform/support/min_sdl.h"
#include "ballistica/shared/math/random.h"
namespace ballistica::base {

1
src/ballistica/base/input/device/touch_input.cc
View File

@ -8,7 +8,6 @@
#include "ballistica/base/python/base_python.h"
#include "ballistica/base/support/app_config.h"
#include "ballistica/base/ui/ui.h"
#include "ballistica/shared/foundation/macros.h"
namespace ballistica::base {

1
src/ballistica/base/python/support/python_context_call.cc
View File

@ -6,7 +6,6 @@
#include "ballistica/base/ui/ui.h"
#include "ballistica/core/python/core_python.h"
#include "ballistica/shared/foundation/event_loop.h"
#include "ballistica/shared/generic/lambda_runnable.h"
#include "ballistica/shared/generic/utils.h"
#include "ballistica/shared/python/python.h"
#include "ballistica/shared/python/python_sys.h"

2
src/ballistica/base/ui/ui.cc
View File

@ -14,8 +14,6 @@
#include "ballistica/base/ui/dev_console.h"
#include "ballistica/base/ui/ui_delegate.h"
#include "ballistica/shared/foundation/event_loop.h"
#include "ballistica/shared/foundation/macros.h"
#include "ballistica/shared/generic/native_stack_trace.h"
#include "ballistica/shared/generic/utils.h"
namespace ballistica::base {

1
src/ballistica/classic/support/stress_test.cc
View File

@ -5,7 +5,6 @@
#include "ballistica/base/graphics/graphics_server.h"
#include "ballistica/base/graphics/renderer/renderer.h"
#include "ballistica/base/input/device/test_input.h"
#include "ballistica/base/input/input.h"
#include "ballistica/base/support/app_timer.h"
#include "ballistica/classic/classic.h"

2
src/ballistica/scene_v1/python/methods/python_methods_networking.cc
View File

@ -8,14 +8,12 @@
#include "ballistica/core/python/core_python.h"
#include "ballistica/scene_v1/connection/connection_set.h"
#include "ballistica/scene_v1/connection/connection_to_client.h"
#include "ballistica/scene_v1/connection/connection_to_host.h"
#include "ballistica/scene_v1/connection/connection_to_host_udp.h"
#include "ballistica/scene_v1/python/scene_v1_python.h"
#include "ballistica/scene_v1/support/scene_v1_app_mode.h"
#include "ballistica/shared/math/vector3f.h"
#include "ballistica/shared/networking/sockaddr.h"
#include "ballistica/shared/python/python.h"
#include "ballistica/shared/python/python_ref.h"
#include "ballistica/shared/python/python_sys.h"
namespace ballistica::scene_v1 {

1
src/ballistica/scene_v1/support/scene_v1_app_mode.cc
View File

@ -2,7 +2,6 @@
#include "ballistica/scene_v1/support/scene_v1_app_mode.h"
#include "ballistica/base/assets/assets.h"
#include "ballistica/base/audio/audio.h"
#include "ballistica/base/audio/audio_source.h"
#include "ballistica/base/graphics/graphics.h"

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 = 21754;
const int kEngineBuildNumber = 21755;
const char* kEngineVersion = "1.7.33";
const int kEngineApiVersion = 8;

2
src/ballistica/ui_v1/python/methods/python_methods_ui_v1.cc
View File

@ -5,10 +5,8 @@
#include "ballistica/base/app_adapter/app_adapter.h"
#include "ballistica/base/app_mode/app_mode.h"
#include "ballistica/base/assets/sound_asset.h"
#include "ballistica/base/input/input.h"
#include "ballistica/base/platform/base_platform.h"
#include "ballistica/base/python/base_python.h"
#include "ballistica/base/support/plus_soft.h"
#include "ballistica/ui_v1/python/class/python_class_ui_mesh.h"
#include "ballistica/ui_v1/python/class/python_class_ui_sound.h"
#include "ballistica/ui_v1/python/class/python_class_ui_texture.h"

1
src/ballistica/ui_v1/python/ui_v1_python.cc
View File

@ -17,7 +17,6 @@
#include "ballistica/ui_v1/python/class/python_class_ui_texture.h"
#include "ballistica/ui_v1/python/class/python_class_widget.h"
#include "ballistica/ui_v1/python/methods/python_methods_ui_v1.h"
#include "ballistica/ui_v1/widget/text_widget.h"
namespace ballistica::ui_v1 {

1
src/ballistica/ui_v1/ui_v1.cc
View File

@ -6,7 +6,6 @@
#include "ballistica/base/graphics/component/empty_component.h"
#include "ballistica/base/input/input.h"
#include "ballistica/base/support/app_config.h"
#include "ballistica/shared/generic/native_stack_trace.h"
#include "ballistica/ui_v1/python/ui_v1_python.h"
#include "ballistica/ui_v1/support/root_ui.h"
#include "ballistica/ui_v1/widget/root_widget.h"

1
src/ballistica/ui_v1/widget/text_widget.cc
View File

@ -2,7 +2,6 @@
#include "ballistica/ui_v1/widget/text_widget.h"
#include "ballistica/base/app_adapter/app_adapter.h"
#include "ballistica/base/audio/audio.h"
#include "ballistica/base/graphics/component/empty_component.h"
#include "ballistica/base/graphics/component/simple_component.h"