From bd5b7b5a21b5707fc47cf5ddcb6c8b1481813829 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 2 Jul 2024 22:19:06 -0700 Subject: [PATCH] tidying --- .efrocachemap | 56 ++++++++++++++--------------- CHANGELOG.md | 3 +- Makefile | 8 ++--- src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/shared/ballistica.cc | 2 +- 5 files changed, 36 insertions(+), 35 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 7f15e759..c302b967 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4038,26 +4038,26 @@ "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "fafef337dc36981a73a7c0fb4793e1aa", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "b0aa1c5f84dc14b5eec5416e0c42c2dd", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "fd27f2e7e072311db6e76a310e5b3248", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "7ab1218f73a6bc9c1f785ffd7cceba24", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "4ba1f3ee76aa94ea10d9106b2882f477", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "4f5bcafa8fcea60c202f57392b790749", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "5a204e6e6fc09c7601f82ee5dbf4ac5b", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "0f922df6490548a53bb6a871a018f140", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "8830cb31c8cf6fb67691bdf697d67b2d", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "b9aa5cea9726fcdd6e6468d065b7a5f0", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "9d4a199b6ec1dc775ef8835bf185b576", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "7f51dec440a47bf9468c73795f6f6faf", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "7de19401a7bd5180fccca69ca3deabce", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "8ee6a1cd92f095e73756798c228fabb9", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "4fdadf7c85bc4025b1e89a78d136f163", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "4cabc0639011c73a7957aeae844df6fe", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "66bb1553c81ba8ee21adbb2cb954530d", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "c577ee1c5c4f08530fad64e8fefe4cf8", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "30212d030049d0fb89e3aa0cc97d0e0a", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "0a2b976285806c698f01e641f9074aca", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "c23492bd300919d79039f2294b0b2b96", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "1220df4e2f1c30a081600d5966e11ba9", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "1e17e08b7b0afc087853426e54473204", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "0744710d8c77a89ce7aa9e4cd1c91a10", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "aa40e107e5743c4ec1f59e480e0341f4", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "d90cf4082d1ea71c8d9248d4722f97e2", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "2c790ef5608e89c401abc0b34bcfbd1b", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "ce80a14162abc545be2f47b40745cf66", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "a00e0d193c8d1c85552038eef0449aa2", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "070268d237140e8a0ae20673c1364c1c", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "0bee20c9c3e0281ddd9123433c5b1963", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "5b98c6dff8d810278fc652bd4eaf837a", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "77e8c57a0539546bdf4701973dd45403", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "4af2d88098a91eee8ea7eddebcf89821", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "bce5ce779d30476276ffbbfb4eec9fec", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "9005b6210b66e0bb89d8be17410c5b1c", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "1ff12e04bd894104ea4a5a5a16dbbe15", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "5e504cad6f1140e1b9eb1068889af808", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "f016ca258adbace89ac23a4dcc2e5609", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "64455571d8ea90833df23d255092b779", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "f231b10895bdcb542de87b887ca181fd", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "ae936a119668ede7b36f38c8672f4bf8", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "f231b10895bdcb542de87b887ca181fd", @@ -4074,14 +4074,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "efffc4f330e77530accd9a9f82840a6c", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "c20363fe2af3d54e666b1c8ee67f6b76", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "efffc4f330e77530accd9a9f82840a6c", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "52b68c71bcb167a388b89352c09dbbe8", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "36f3e21b79ff41c8bbe9fa797833c0d8", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "bc1f287cdcee0ad7839f2cdc5f01a6e4", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "22c3b0ec1cabf246c7dee9be3e0ef48b", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "fa12a11770061d9a34e6b4bd35930842", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "6770c990a7a562c796e74b13247f62d0", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "cd6b6dcc26978740733af1dc99d92810", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "c3d76e035872d841beb85a558bfca107", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "30611985d939ca8757f9ae2e1663c953", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "389dcc02b8b856aff7a737d42d693bbb", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "26c0a3c1865c9a41f0f85b1f0caa1c28", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "5ff8ca7bcae0ecf6dea50ac5e026fe52", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "afeb8a7f6a0adafbffd40e2ef606ddf4", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "e9267b4d56a2893626c4a868f3527c4b", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "dfaeb5ff8741dcd12581c5986364274c", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a6a94aa6c8eeecda9628d3e4bd756b92", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "5548f407d97e380069f6c596c4e36cd7", "src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d", diff --git a/CHANGELOG.md b/CHANGELOG.md index ac1fb89f..e9c7e592 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ -### 1.7.36 (build 21902, api 8, 2024-07-02) +### 1.7.36 (build 21905, api 8, 2024-07-02) +- Wired up initial support for using asset-packages for bundled assets. - bacloud workspace commands are now a bit smarter; you can now do things like `bacloud workspace put .` or even just `bacloud workspace put` and it will work. Previously such cases required explicitly passing the workspace name diff --git a/Makefile b/Makefile index 23b1bf14..a163978e 100644 --- a/Makefile +++ b/Makefile @@ -237,11 +237,11 @@ prefab-gui-release: prefab-gui-release-build # Assemble a debug build for this platform. prefab-gui-debug-build: env - $(WSLU) $(PCOMMAND) make_prefab gui-debug + @$(WSLU) $(PCOMMAND) make_prefab gui-debug # Assemble a release build for this platform. prefab-gui-release-build: env - $(WSLU) $(PCOMMAND) make_prefab gui-release + @$(WSLU) $(PCOMMAND) make_prefab gui-release # Assemble & run a server debug build for this platform. prefab-server-debug: prefab-server-debug-build @@ -253,11 +253,11 @@ prefab-server-release: prefab-server-release-build # Assemble a server debug build for this platform. prefab-server-debug-build: env - $(WSLU) $(PCOMMAND) make_prefab server-debug + @$(WSLU) $(PCOMMAND) make_prefab server-debug # Assemble a server release build for this platform. prefab-server-release-build: env - $(WSLU) $(PCOMMAND) make_prefab server-release + @$(WSLU) $(PCOMMAND) make_prefab server-release # Clean all prefab builds. prefab-clean: diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 551e1ce6..70ad472b 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21902 +TARGET_BALLISTICA_BUILD = 21905 TARGET_BALLISTICA_VERSION = '1.7.36' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index b0448c57..c71d3f6b 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 21902; +const int kEngineBuildNumber = 21905; const char* kEngineVersion = "1.7.36"; const int kEngineApiVersion = 8;