diff --git a/.efrocachemap b/.efrocachemap index 4e10c4c6..5d4fda8f 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3934,14 +3934,14 @@ "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f", "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ac/96/c3b9934061393fe09cc90ff24b8d", "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/38/2b/5641b3b40846f74f232771ac0457", - "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/26/6c/76d9bd89859b444798fa5f150603", - "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/92/d3/dd71ceb73332e855a9e78edbae11", - "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e6/34/66b7c424a1481b7cff545f16f0f4", - "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d6/5e/9f3bb3103d0bd8e8b24f331820d4", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/8c/7d/5c3af1223b81b267716d6697f3f6", - "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/58/7a/d60fbf3ec81b4083e75843824d63", - "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/30/2c/3bc8f419c38188ad8bd3770814a0", - "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/12/63/73b0c2c2cac9f96e210220c9d338", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/5b/e6/476c447cc5887f414b0a62e8851b", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b0/31/67ff1bb94408779ca359efcaf9c5" + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/72/55/dfa285b98b91dcf3b9a4959b2de7", + "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/93/f4/e4f6f62cf48e2b945a2e129debc2", + "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b5/37/a3cf70e0fcddeedded8a59ea83a1", + "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/bf/27/d1b008386dab949c7a56e7d91f1f", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/52/eb/cd526a92072fc57ceff9ead7be4c", + "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9d/6f/bdba4c9916b076076608e5c1b10a", + "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/1d/4e/1fefad2610732934ec9afacf15e4", + "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/74/81/60b8c9b55342697d3708827c2fb5", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/75/b7/d1c41081caeefeb6d367ea27d591", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/9a/b6/4f2271173853f4e260c3d50488e6" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 11717dfc..23814529 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ### 1.5.26 (20178) -- Simplified licensing header on python scripts.. +- Simplified licensing header on python scripts. +- Project rework in prep for open-sourcing parts of c++ layer. ### 1.5.25 (20176) - Added Venetian language (thanks Federico!) diff --git a/ballisticacore-cmake/CMakeLists.txt b/ballisticacore-cmake/CMakeLists.txt index 888fee8c..81fd98a8 100644 --- a/ballisticacore-cmake/CMakeLists.txt +++ b/ballisticacore-cmake/CMakeLists.txt @@ -171,15 +171,7 @@ endif () # BallisticaCore binary. add_executable(ballisticacore - ${BA_SRC_ROOT}/external/qrencode-3.4.4/qrencode/bitstream.c - ${BA_SRC_ROOT}/external/qrencode-3.4.4/qrencode/mask.c - ${BA_SRC_ROOT}/external/qrencode-3.4.4/qrencode/mmask.c - ${BA_SRC_ROOT}/external/qrencode-3.4.4/qrencode/mqrspec.c - ${BA_SRC_ROOT}/external/qrencode-3.4.4/qrencode/qrencode.c - ${BA_SRC_ROOT}/external/qrencode-3.4.4/qrencode/qrinput.c - ${BA_SRC_ROOT}/external/qrencode-3.4.4/qrencode/qrspec.c - ${BA_SRC_ROOT}/external/qrencode-3.4.4/qrencode/rscode.c - ${BA_SRC_ROOT}/external/qrencode-3.4.4/qrencode/split.c + ${BA_SRC_ROOT}/external/qr_code_generator/QrCode.cpp # AUTOGENERATED_PUBLIC_BEGIN (this section is managed by the "update_project" tool) ${BA_SRC_ROOT}/ballistica/app/app.cc # AUTOGENERATED_PUBLIC_END @@ -188,7 +180,6 @@ add_executable(ballisticacore target_include_directories(ballisticacore PRIVATE ${Python_INCLUDE_DIRS} ${BA_SRC_ROOT}/external/open_dynamics_engine-ef - ${BA_SRC_ROOT}/external/qrencode-3.4.4 ${EXTRA_INCLUDE_DIRS} ) diff --git a/docs/ba_module.md b/docs/ba_module.md index ff4e81d9..a98f543a 100644 --- a/docs/ba_module.md +++ b/docs/ba_module.md @@ -1,5 +1,5 @@ -

last updated on 2020-09-17 for Ballistica version 1.5.26 build 20188

+

last updated on 2020-09-30 for Ballistica version 1.5.26 build 20190

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!