From 85296ea6ab1c603e010ebba57b6c987759306c7a Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Tue, 13 Oct 2020 08:55:38 -0700 Subject: [PATCH] Language updates and tidying --- .efrocachemap | 40 ++++++++++++++--------------- ballisticacore-cmake/CMakeLists.txt | 11 ++++---- docs/ba_module.md | 2 +- src/ballistica/ballistica.cc | 2 +- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 0c74cbbc..f71ffac6 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -420,7 +420,7 @@ "assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/04/0a/c4f7d2794b018593ab0b2bcb07f0", "assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/06/4d/18777c9a2eb2207a2891a2837a70", "assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/81/90/23ab1ecc8c55267bd904a9c05344", - "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/f5/92/636aa7d2257db81d98bd17d43ffd", + "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/48/27/1b912861ed8d8795add395df41b6", "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/de/25/74be4875c2a0e22b813a4e1a103b", "assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/49/5f/b29bb65369040892fe6601801637", "assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/c3/3f/c37ac3c65ac65f171af9313a502a", @@ -434,7 +434,7 @@ "assets/build/ba_data/data/languages/french.json": "https://files.ballistica.net/cache/ba1/e3/6d/63e78b12ae9d99e0929671f52c12", "assets/build/ba_data/data/languages/german.json": "https://files.ballistica.net/cache/ba1/3f/62/4eedf8cfad2e5f7ff2136ec19277", "assets/build/ba_data/data/languages/gibberish.json": "https://files.ballistica.net/cache/ba1/97/3a/b6746b7f89af424584c794c4d11f", - "assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/17/78/3fd0dca40e632ce53d03a944e7fa", + "assets/build/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/a4/2c/8c43b338be2367441b87378e19c1", "assets/build/ba_data/data/languages/hindi.json": "https://files.ballistica.net/cache/ba1/d5/19/5e450e35b83fe68722330d03b896", "assets/build/ba_data/data/languages/hungarian.json": "https://files.ballistica.net/cache/ba1/87/2d/027aa239eb66ea8f496562f4fd83", "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/9a/3d/9aff685d04d2e1cabb2f9ddafcf3", @@ -3932,24 +3932,24 @@ "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/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/b8/23/311ba81c00387d5821bd9488f7fd", - "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ec/b5/09119ca55d097c92231279cc6b09", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/66/5a/1f360ab9c061c5d41ebfc65cec43", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/02/cc/7efe1819ac6b16fdb63134dddf9d", - "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/27/4b/b56f5342d1140ab8e3ff638d314d", - "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/88/8e/ddc8c72f1574f887f45144c63c92", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/8b/43/53acd5bb4e35fa50a6ea49c22e66", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a4/2e/7653de2c379b26b2a340547a75a1", - "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/8d/67/7d34311a4d53e809313f590405b6", - "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/81/cd/a0eee04db8c2fd2cbda796501e58", - "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/a5/79/a0e863c6951cee546bfaddf1e10f", - "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/c6/a4/a0124a15b270faa812f17f80898b", - "build/prefab/lib/linux_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/cf/3d/192aa3600091cdc9222c964b0775", + "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/31/9f/f2aa794e452ae380c363dab7744e", + "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/cf/0d/24472a7bce6c6de12493d506ce64", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/3b/64/e544f697481ca43b38b3568b8a1e", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/70/f0/5df34ce15aa534d8c42cd7235984", + "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/62/2c/4ddcde6c2483ab591646c2f49257", + "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/94/e8/f272b412ca176fde161346bf1363", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d3/b2/63d02079a0fb191abf8366f64814", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/44/67/c3d7dcb5e16ad5451ba7daf2f9bd", + "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/e0/2f/1665f879dbc7d9241b84990cffaf", + "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/fe/d6/77e6b6d65a3484e4c264be8dbfab", + "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/2a/01/3d42c36b2afd5a24d37edc2f6883", + "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/f5/89/558acefe3774686fc10f967e737b", + "build/prefab/lib/linux_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ba/78/292390a40c1e4b9804d7572d7a04", "build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/4c/a9/568023651355fdd0ce7a865c2872", - "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/82/80/5c56c9f311d997f73ed3ed41eb39", + "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/69/cc/a5555af8babdef9948380ede8431", "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/42/be/79eec8bc7b2cc914cc6cb8ed0769", - "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/7a/f9/f4e0a049de82210b1a6ce242f51d", - "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a6/74/ccba7f0db9f5a32033e4bd77e183", - "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/96/b0/88bdf10a9a7cb7ca65b2130ed109", - "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f0/09/0c95bbb431fa8c93f1e23d508b37" + "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/66/66/063065ddf0a99cb992e936373f53", + "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/30/6f/27022976202b3886ad4a395f1f06", + "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/9e/55/2caa189c8674ef770c2ab3a7cd7d", + "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b2/14/f0e7a95e18c4484cf4a7894a3fbd" } \ No newline at end of file diff --git a/ballisticacore-cmake/CMakeLists.txt b/ballisticacore-cmake/CMakeLists.txt index 8809727e..88f032d6 100644 --- a/ballisticacore-cmake/CMakeLists.txt +++ b/ballisticacore-cmake/CMakeLists.txt @@ -64,14 +64,11 @@ endif () # Currently seeing warnings about parameter order changing in GCC 7.1 # on Raspberry Pi builds. We never need to care about C++ abi compatibility # so just silencing them for now. Can maybe remove this later if they stop. -if (CMAKE_COMPILER_IS_GNUCXX) +if (CMAKE_CXX_COMPILER_ID MATCHES GNU) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi") endif() -# message("GOT SDL INC ${SDL2_INCLUDE_DIRS}") -# message(FATAL_ERROR "SO FAR SO GOOD") - set(BA_SRC_ROOT src) include_directories(${BA_SRC_ROOT}) add_compile_options(-include ballistica/config/config_cmake.h) @@ -162,11 +159,13 @@ add_library(ode ) target_include_directories(ode PRIVATE ${ODE_SRC_ROOT}) -# EWWW; GCC gives us bad mesh collisions with -O3 (and maybe -O2) +# EWWW; GCC gives us bad mesh collisions with -O3 (and maybe -O2?) # need to finally get to the bottom of this but limiting to -01 for now. # (-O2 might be safe??... or what about -Os? Should test again.) if (CMAKE_BUILD_TYPE MATCHES Release) - target_compile_options(ode PRIVATE -O1) + if (CMAKE_CXX_COMPILER_ID MATCHES GNU) + target_compile_options(ode PRIVATE -O1) + endif() endif () # BallisticaCore binary. diff --git a/docs/ba_module.md b/docs/ba_module.md index 9e071cb9..1735a245 100644 --- a/docs/ba_module.md +++ b/docs/ba_module.md @@ -1,5 +1,5 @@ -

last updated on 2020-10-12 for Ballistica version 1.5.26 build 20201

+

last updated on 2020-10-13 for Ballistica version 1.5.26 build 20202

This page documents the Python classes and functions in the 'ba' module, which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please let me know. Happy modding!

diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index c0ec7ae3..b6ac39ec 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -29,7 +29,7 @@ namespace ballistica { // These are set automatically via script; don't change here. -const int kAppBuildNumber = 20201; +const int kAppBuildNumber = 20202; const char* kAppVersion = "1.5.26"; // Our standalone globals.