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

tidying and prefab fixes

Browse Source
This commit is contained in:
Eric Froemling 2021-06-10 12:52:11 -05:00
parent 07a499ca52
commit 12d704e672
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
4 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.efrocachemap
View File

@ -3933,26 +3933,26 @@
"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",
"ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a",
"build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b9/5f/a24d0e3decc9c1fd7c8916f3f923",
"build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/7e/0c/4811e0c88609ad03a93031e04418",
"build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/74/1d/fc9e33e565475daaac80da5252f0",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2d/c2/2ced7763507998ebe541e01dd323",
"build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/12/d7/da484b1f54f5072408469fe87281",
"build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/d4/9a/66b1d94d102d4ac24bfa0fed2b32",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/db/c2/8c9536f275e5271f1c21eeb3923b",
"build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c7/4b/8377ba9cd31626637a6804716eda",
"build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/be/08/4070595cdc3acae7ae3a13cc64a5",
"build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/7b/ac1a200be0f37078af0991faca3b",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/65/9e/488d49a4ed7c9152caad39c7e1d6",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/9f/55/ffbb6733306e64bea46a3b52b800",
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/e1/0d/57f16944df21a2a7674e2c290f3a",
"build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d0/65/0304b9d5fd18f4ebc2b012e1deb8",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/26/d0/6bfa73d6ca87eeeddc8a243771a8",
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/50/bb/91fc543ae2b907f808263b71953c",
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b1/18/808dace258cf071dcc43540f5a35",
"build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/11/86/a4bdc3fff7c351fd14525b6e0ba9",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/00/bb/79b2ef9373b2f9f030921dc124c5",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ae/4a/c793ea4f4255ea56d136cfe00eff",
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/a0/cd/20dd8f27f6a6636fcc72bc4b0f76",
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b1/18/98e6cc26c43affc6bda50568d586",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/2b/bd/2fd8a4436bbc4dbb9406862840ef",
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/da/fc/e8e75337f8cc48b9b3f763246f13",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/33/63/382b5d03b6859de55c252e1bc53f",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/5a/90/b6ff7f753011448bd1ef10f98525",
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/54/e1/e946d71c83ae5aeb60957c6afba8",
"build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/be/2d/6f7814c61e2cdf64196badcc66ff",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2e/cb/d5bb1384fef2ef9555ce4860b223",
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/95/8c/bb66f5c95dfad4d1e065a1c6ec65",
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/9a/95/ef4cce689188a298a06fd8b91f8f",
"build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ee/12/6e765384e0bdc251c83f49d8f4be",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/84/6c/ba6569adf15bb4e8dba4f4368e3f",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a1/09/37cae1308d189851acc4f4be7e1b",
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/36/22/df6c0eb6ea71cd58ce0c6d104c8b",
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/e9/c6/cda6cff37de9b551c0945cef06d3",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/e8/61/823ab754444032a53f7d3471a6f1",
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/c1/9c/7bbcb97e759e71f8c0839324e8b9",
"build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/17/8a/3e4eec6be82a7d51ec68c2cd9134",
"build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/18/27/4063e018845b61a43d3fb975dda9",
"build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/94/8e/b57d1b16f9a97ae6b75f6aa64d24",
@ -3969,12 +3969,12 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d8/2e/7c67cb2046cafe06d1446851eb18",
"build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c1/37/421b9994eb20ec8e8f5c9d9af098",
"build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/38/fb/b4547e1d925e49887df4a8eb23f1",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/8c/0b/9be1def8b6f8bed7b8f71a539faf",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/ff/7e/99a0285eb245a35e2fb08c7ffb68",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/4f/7d/7fc8fcb8db604f1ef8f743605efd",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/4d/e5/35a0103528941302111286b71703",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/a3/2b/7af61fae139893d2201627e0bd1f",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/92/58/b776d66dd27d86c409cf858dc229",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/b3/1b/ea5970a95243a6422ab9425f496b",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/70/e6/2361224d82ef64479db475a5bc76"
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/d5/32/8ac16267f62d737032137203e4d1",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/02/16/0ef1ac2956df722d8988cb48711f",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/7c/36/84039cc97f3de9fcb67f88c26be6",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/e9/e7/eeafe83124ac7993ebd103c6b344",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/cc/3e/3ecd83648c37d88b2d0462188249",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/66/64/51fbbd98c6ea8907247ffbb49ad1",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/74/3e/bb7d09412d0860fcb6f3240e073c",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/37/29/9e28c583bed35222d48cdd43f7c7"
}

10
Makefile
View File

@ -136,11 +136,11 @@ clean-list:
# Assemble & run a gui debug build for this platform.
prefab-gui-debug: prefab-gui-debug-build
${${shell tools/pcommand prefab_run_var gui-debug}}
$($(shell tools/pcommand prefab_run_var gui-debug))
# Assemble & run a gui release build for this platform.
prefab-gui-release: prefab-gui-release-build
${${shell tools/pcommand prefab_run_var gui-release}}
$($(shell tools/pcommand prefab_run_var gui-release))
# Assemble a debug build for this platform.
prefab-gui-debug-build:
@ -152,11 +152,11 @@ prefab-gui-release-build:
# Assemble & run a server debug build for this platform.
prefab-server-debug: prefab-server-debug-build
${${shell tools/pcommand prefab_run_var server-debug}}
$($(shell tools/pcommand prefab_run_var server-debug))
# Assemble & run a server release build for this platform.
prefab-server-release: prefab-server-release-build
${${shell tools/pcommand prefab_run_var server-release}}
$($(shell tools/pcommand prefab_run_var server-release))
# Assemble a server debug build for this platform.
prefab-server-debug-build:
@ -238,7 +238,7 @@ build/prefab/lib/mac_%_gui/release/libballisticacore_internal.a: .efrocachemap
# Mac server debug:
RUN_PREFAB_MAC_X86_64_SERVER_DEBUG = cd \
build/prefab/full/mac_server_x86_64_server/debug && ./ballisticacore_server
build/prefab/full/mac_x86_64_server/debug && ./ballisticacore_server
RUN_PREFAB_MAC_ARM64_SERVER_DEBUG = cd \
build/prefab/full/mac_arm64_server/debug && ./ballisticacore_server

6
src/ballistica/ballistica.cc
View File

@ -21,7 +21,7 @@
namespace ballistica {
// These are set automatically via script; don't modify them here.
const int kAppBuildNumber = 20376;
const int kAppBuildNumber = 20377;
const char* kAppVersion = "1.6.4";
// Our standalone globals.
@ -155,6 +155,10 @@ auto BallisticaMain(int argc, char** argv) -> int {
std::string error_msg =
std::string("Unhandled exception in BallisticaMain(): ") + exc.what();
// Exiting the app via an exception tends to trigger crash reports
// on various platforms. If it doesn't appear that we're an official live
// build then we'd rather just exit cleanly with an error code and avoid
// polluting crash report logs from dev builds.
FatalError::ReportFatalError(error_msg, true);
bool exit_cleanly = !IsUnmodifiedBlessedBuild();
bool handled = FatalError::HandleFatalError(exit_cleanly, true);

2
tools/batools/build.py
View File

@ -172,7 +172,7 @@ def lazybuild(target: str, category: SourceCategory, command: str) -> None:
"""
paths: List[str]
# Everything possibly affecting generated sources.
# Everything possibly affecting meta builds.
if category is SourceCategory.META:
paths = [
'Makefile', 'tools/generate_code', 'tools/batools/codegen.py',