diff --git a/.efrocachemap b/.efrocachemap index c3d10c8a..1a30a79c 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/6b/43/efceea678ab45ebe36c72ff6fa79", - "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/15/d5/29d9b25931f5c91a7a0db8cd6260", - "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/bc/bf/286df9a4a78d01c5bd02bee224cd", - "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/24/d5/6f25f7ffbdcf3dde835ca8213544", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/d1/f745c2663299168c982f752802d0", - "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9b/dd/90e274f18a93c82e9c2c29a59b41", - "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/9d/9a/c14692e42e5a7376b665af6a8463", - "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/2a/c8/f661b157edda3920f8834124d24b", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/7e/ed/5db67414f8d9444f91631a448bc0", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/7d/9f/9ff4e4c2d64c3dfac362f2b5af15" + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/26/3b/ea7dd76e5cf6407dc7e20576f191", + "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ed/2a/ba83223990092ce3a4eafd491c76", + "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fe/cd/67cb2a544dada857323d01ff6337", + "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fc/8c/2bbe38abf6f4e718f9af83d5b120", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/3d/9a/ed85e7110f940e24a3358fd01b39", + "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/f7/94/406ef9f6014282c1852190765faf", + "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/ef/13/78a497e9a6055369470bf58d318e", + "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/10/42/5a50d344b3adb1441bbd14e244ed", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/3f/00/85d7560c026c81847d6591ab2c7f", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/80/fb/f7017b6091830f47194a37e5d63f" } \ No newline at end of file diff --git a/ballisticacore-cmake/.idea/dictionaries/ericf.xml b/ballisticacore-cmake/.idea/dictionaries/ericf.xml index 2467a179..db058f62 100644 --- a/ballisticacore-cmake/.idea/dictionaries/ericf.xml +++ b/ballisticacore-cmake/.idea/dictionaries/ericf.xml @@ -398,7 +398,6 @@ ifaddr ifaddrs ifdebug - iiarcade iiiiisss illum ilock diff --git a/ballisticacore-cmake/CMakeLists.txt b/ballisticacore-cmake/CMakeLists.txt index 81fd98a8..967dbef0 100644 --- a/ballisticacore-cmake/CMakeLists.txt +++ b/ballisticacore-cmake/CMakeLists.txt @@ -183,7 +183,7 @@ target_include_directories(ballisticacore PRIVATE ${EXTRA_INCLUDE_DIRS} ) -# NOTE: seems we need to add 'dl' here for raspberry pi with manually +# NOTE: seems we need to add 'dl' here for raspberry pi with a manually # built Python 3.8. Might be able to remove later. target_link_libraries(ballisticacore PRIVATE ballisticacore_private ode pthread ${Python_LIBRARIES} diff --git a/docs/ba_module.md b/docs/ba_module.md index 4b1bcdc7..e7465286 100644 --- a/docs/ba_module.md +++ b/docs/ba_module.md @@ -1,5 +1,5 @@ -

last updated on 2020-10-09 for Ballistica version 1.5.26 build 20198

+

last updated on 2020-10-10 for Ballistica version 1.5.26 build 20199

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 1ba009e9..8956bf88 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 = 20198; +const int kAppBuildNumber = 20199; const char* kAppVersion = "1.5.26"; // Our standalone globals. diff --git a/src/ballistica/game/game.h b/src/ballistica/game/game.h index c09334eb..7dabd7ad 100644 --- a/src/ballistica/game/game.h +++ b/src/ballistica/game/game.h @@ -336,9 +336,6 @@ class Game : public Module { private: auto InitSpecialChars() -> void; - auto AdViewComplete(const std::string& purpose, bool actually_showed) -> void; - auto AwardAdTickets() -> void; - auto AwardAdTournamentEntry() -> void; auto Draw() -> void; auto UDPConnectionPacket(const std::vector& data, const SockAddr& addr) -> void; diff --git a/src/ballistica/python/python.h b/src/ballistica/python/python.h index 6efe9fbe..78985b75 100644 --- a/src/ballistica/python/python.h +++ b/src/ballistica/python/python.h @@ -112,11 +112,6 @@ class Python { auto inited() const -> bool { return inited_; } - /// Attempt to push the log to the server - returns true if no error occurs - /// (note; this doesn't mean that the log actually made it; just that it got - /// sent off) - static auto PutLog(bool fatal, bool short_suicide_timer = true) -> bool; - /// Filter incoming chat message from client. /// If returns false, message should be ignored. auto FilterChatMessage(std::string* message, int client_id) -> bool;