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

Tidying

Browse Source
This commit is contained in:
Eric Froemling 2021-01-04 11:39:01 -08:00
parent f6c8ab8ea0
commit 114a62142c
5 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.efrocachemap
View File

@ -3932,32 +3932,32 @@
"assets/build/windows/Win32/ucrtbased.dll": "https://files.ballistica.net/cache/ba1/b5/85/f8b6d0558ddb87267f34254b1450", "assets/build/windows/Win32/ucrtbased.dll": "https://files.ballistica.net/cache/ba1/b5/85/f8b6d0558ddb87267f34254b1450",
"assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e", "assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e",
"assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f", "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f",
"build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/2d/47/70507dc4ee6ab8e46a220e4dd1a1", "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/69/cf/2d498649d4f27969dd27cf6f2f87",
"build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/96/1a/17bd9e8509353e2937e3e769b165", "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/29/d5/44ac4e89bb956a13cb508d3a175f",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a7/cb/3ef7c9ab6e2e58d61cb5479e62e3", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/57/dd/c199e217295f59733aee48661d29",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4c/9f/fb709ab8d49fa827721011421fa5", "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/28/93/3d6553fd3f4fbf48bf41fe25bc59",
"build/prefab/full/mac_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/d8/a5/17c902c43de2f8629d8c1625ef6a", "build/prefab/full/mac_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/31/d1/f1d80e852a25c55f0a34e7bfd129",
"build/prefab/full/mac_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ea/22/20c83879a1a4ed701f839082e746", "build/prefab/full/mac_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/48/77/19b040bc1ec1241e2b7d6451481b",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a7/25/18654ae3d9612df27800fa8af34d", "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/0e/b0/f5eaf21efe04a08f8fa80c5d57d7",
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/0e/f3/45e59253c707eef0be872905fe46", "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/95/ac/c14ca7cf53f20d6cadd6b4bf3ad7",
"build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/40/13/b9df1d23d1d9926250c6dd07e6d1", "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/00/a4/0d002d9b8cabc7f5ce4abbdd65d9",
"build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/fa/64/e56023d1b39776edeac6bd868af1", "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/4d/29/d81b6055bd260ec0f31e72556fe9",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d1/c7/7fe28f133a27c25664ffc7efeae8", "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/59/71/0926861ac8993792873dfe25bbda",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/62/8c/33d85f57f1ce973807813e127831", "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/05/d2/70a8b57f834b05a594fdaf33197b",
"build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/9e/67/125ad4394abc500ad6bc4d065b7c", "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/3c/39/0e5c20181c8bf54890bff339fd85",
"build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/2a/93/5e0813399d63da13ee3e97b6a8df", "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/09/d4/fe2c7d8b169c04997a5efda6230d",
"build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/0a/24/1f4d6b6d7734013eb9df60286759", "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/5a/2f/14b75aeb322f706f5ad8451cea56",
"build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/66/89/8c4f38cf9614c193afb4a4d80c30", "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/2e/11/385c908b88cbe064fffcab977934",
"build/prefab/lib/linux_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ef/d0/49b99ce32e5e2b01b056fbac5c67", "build/prefab/lib/linux_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ef/d0/49b99ce32e5e2b01b056fbac5c67",
"build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/83/25/980050d75bbea49a84652209050c", "build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/83/25/980050d75bbea49a84652209050c",
"build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/47/aa/e82233695a50974e7e22db4e7146", "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/47/aa/e82233695a50974e7e22db4e7146",
"build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/2b/45/7f9fbae208890455fce2fbc172d3", "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/2b/45/7f9fbae208890455fce2fbc172d3",
"build/prefab/lib/mac_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/6e/a7/e3f999e4c64f77d824db35c5db3a", "build/prefab/lib/mac_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/bb/df/a0a9c51ce2f1e029a5236a79d1be",
"build/prefab/lib/mac_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f0/86/0a14b46659437a159d6d7ec64be6", "build/prefab/lib/mac_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c6/fb/064e21c207fbeb2e5c530d8a5bb5",
"build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/4c/0b/8b27206805551a9b7971c96d1d20", "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a1/60/bb56c245d4d1446f5bc9ce8e8551",
"build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/86/ed/36da3f7428e19ab4167f4b101f05", "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/11/31/a89f9b6faa94038b8a102d3ea743",
"build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ce/b4/9e290c3b1fe0b28b6da1af1189ac", "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/72/eb/5bf7d6e6e60b5731e45a99c90188",
"build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/34/1d/0ed672725d077df9a6a828934647", "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/9f/fb/976db5cf3b4095c1270a7713a791",
"build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/43/e8/4d42414e95575fd1944c0f130842", "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/87/72/4f1ff941dd87814a1e2067e50793",
"build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d2/dd/6e5fa5f554846b7f705f3f598899" "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/73/1d/df32fbe051ab27eb59fbb0a2eef4"
} }

8
Makefile
View File

@ -575,22 +575,22 @@ format-makefile: prereqs
# Run all project checks. (static analysis) # Run all project checks. (static analysis)
check: update-check check: update-check
@${MAKE} -j3 cpplint pylint mypy @${MAKE} -j3 cpplint pylint mypy
@tools/pcommand echo GRN ALL CHECKS PASSED! @tools/pcommand echo SGRN BLD ALL CHECKS PASSED!
# Same as check but no caching (all files are checked). # Same as check but no caching (all files are checked).
check-full: update-check check-full: update-check
@${MAKE} -j3 cpplint-full pylint-full mypy-full @${MAKE} -j3 cpplint-full pylint-full mypy-full
@tools/pcommand echo GRN ALL CHECKS PASSED! @tools/pcommand echo SGRN BLD ALL CHECKS PASSED!
# Same as 'check' plus optional/slow extra checks. # Same as 'check' plus optional/slow extra checks.
check2: update-check check2: update-check
@${MAKE} -j4 cpplint pylint mypy pycharm @${MAKE} -j4 cpplint pylint mypy pycharm
@tools/pcommand echo GRN ALL CHECKS PASSED! @tools/pcommand echo SGRN BLD ALL CHECKS PASSED!
# Same as check2 but no caching (all files are checked). # Same as check2 but no caching (all files are checked).
check2-full: update-check check2-full: update-check
@${MAKE} -j4 cpplint-full pylint-full mypy-full pycharm-full @${MAKE} -j4 cpplint-full pylint-full mypy-full pycharm-full
@tools/pcommand echo GRN ALL CHECKS PASSED! @tools/pcommand echo SGRN BLD ALL CHECKS PASSED!
# Run Cpplint checks on all C/C++ code. # Run Cpplint checks on all C/C++ code.
cpplint: prereqs cpplint: prereqs

2
src/ballistica/ballistica.cc
View File

@ -21,7 +21,7 @@
namespace ballistica { namespace ballistica {
// These are set automatically via script; don't change here. // These are set automatically via script; don't change here.
const int kAppBuildNumber = 20264; const int kAppBuildNumber = 20265;
const char* kAppVersion = "1.5.30"; const char* kAppVersion = "1.5.30";
// Our standalone globals. // Our standalone globals.

5
src/ballistica/ui/widget/container_widget.cc
View File

@ -315,7 +315,6 @@ auto ContainerWidget::HandleMessage(const WidgetMessage& m) -> bool {
w->HandleMessage(m); w->HandleMessage(m);
} }
return true; return true;
break;
} }
case WidgetMessage::Type::kStart: { case WidgetMessage::Type::kStart: {
@ -1142,7 +1141,9 @@ void ContainerWidget::SetTransition(TransitionType t) {
bg_dirty_ = glow_dirty_ = true; bg_dirty_ = glow_dirty_ = true;
ContainerWidget* parent = parent_widget(); ContainerWidget* parent = parent_widget();
if (parent == nullptr) return; if (parent == nullptr) {
return;
}
parent->CheckLayout(); parent->CheckLayout();
millisecs_t net_time = g_game->master_time(); millisecs_t net_time = g_game->master_time();
transition_type_ = t; transition_type_ = t;

34
tools/efrotools/code.py
View File

@ -862,28 +862,30 @@ def check_clioncode(projroot: Path, full: bool, verbose: bool) -> None:
print('Clearing CLion caches...', flush=True) print('Clearing CLion caches...', flush=True)
subprocess.run('rm -rf ~/Library/Caches/CLion*', shell=True, check=True) subprocess.run('rm -rf ~/Library/Caches/CLion*', shell=True, check=True)
# UPDATE: seems this is unnecessary now; should double check.
# Note: I'm assuming this project needs to be open when the GUI # Note: I'm assuming this project needs to be open when the GUI
# comes up. Currently just have one project so can rely on auto-open # comes up. Currently just have one project so can rely on auto-open
# but may need to get fancier later if that changes. # but may need to get fancier later if that changes.
print('Launching GUI CLion to rebuild caches...', flush=True) if bool(False):
process = subprocess.Popen(str(clionbin)) print('Launching GUI CLion to rebuild caches...', flush=True)
process = subprocess.Popen(str(clionbin))
# Wait a moment and ask it nicely to die. # Wait a moment and ask it nicely to die.
waittime = 120 waittime = 120
while waittime > 0: while waittime > 0:
print(f'Waiting for {waittime} more seconds.') print(f'Waiting for {waittime} more seconds.')
time.sleep(10) time.sleep(10)
waittime -= 10 waittime -= 10
# Seems killing it via applescript is more likely to leave it # Seems killing it via applescript is more likely to leave it
# in a working state for offline inspections than TERM signal.. # in a working state for offline inspections than TERM signal..
subprocess.run("osascript -e 'tell application \"CLion\" to quit'", subprocess.run("osascript -e 'tell application \"CLion\" to quit'",
shell=True, shell=True,
check=False) check=False)
# process.terminate() # process.terminate()
print('Waiting for GUI CLion to quit...', flush=True) print('Waiting for GUI CLion to quit...', flush=True)
process.wait(timeout=60) process.wait(timeout=60)
print('Launching Offline CLion to run inspections...', flush=True) print('Launching Offline CLion to run inspections...', flush=True)
_run_idea_inspections_cached( _run_idea_inspections_cached(