Skip to content

Commit

Permalink
Lots of stuff. Chests now functional for tourneys
Browse files Browse the repository at this point in the history
  • Loading branch information
efroemling committed Jan 11, 2025
1 parent 690da5a commit 2190568
Show file tree
Hide file tree
Showing 140 changed files with 4,952 additions and 1,649 deletions.
111 changes: 67 additions & 44 deletions .efrocachemap

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### 1.7.37 (build 22155, api 9, 2024-12-31)
### 1.7.37 (build 22178, api 9, 2025-01-11)
- Bumping api version to 9. As you'll see below, there's some UI changes that
will require a bit of work for any UI mods to adapt to. If your mods don't
touch UI stuff at all you can simply bump your api version and call it a day.
Expand Down Expand Up @@ -176,6 +176,21 @@
should use arrow keys for navigation. To update any old UI code, search for
and remove any 'claims_tab' arguments to UI calls since that argument no
longer exists.
- Added a `get_unknown_type_fallback()` method to `dataclassio.IOMultiType`.
This be defined to allow multi-type data to be loadable even in the presence
of new types it doesn't recognize.
- Added a `lossy` arg to `dataclassio.dataclass_from_dict()` and
`dataclassio.dataclass_from_json()`. Enum value fallbacks and the new
multitype fallbacks are now only applied when `lossy` is True. This also flags
the returned dataclass to prevent it from being serialized back out. Fallbacks
are useful for forward compatibility, but they are also dangerous in that they
can silently modify/destroy data, so this mechanism will hopefully help keep
them used safely.
- Added a spinner widget (creatable via `bauiv1.spinnerwidget()`). This should
help things look more alive than the static 'loading...' text I've been using
in various places.
- Tournament now award chests instead of tickets.
- Tournaments are now free to enter if you are running this build or newer.

### 1.7.36 (build 21944, api 8, 2024-07-26)
- Wired up Tokens, BombSquad's new purchasable currency. The first thing these
Expand Down
2 changes: 2 additions & 0 deletions ballisticakit-cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,8 @@ set(BALLISTICA_SOURCES
${BA_SRC_ROOT}/ballistica/ui_v1/widget/row_widget.h
${BA_SRC_ROOT}/ballistica/ui_v1/widget/scroll_widget.cc
${BA_SRC_ROOT}/ballistica/ui_v1/widget/scroll_widget.h
${BA_SRC_ROOT}/ballistica/ui_v1/widget/spinner_widget.cc
${BA_SRC_ROOT}/ballistica/ui_v1/widget/spinner_widget.h
${BA_SRC_ROOT}/ballistica/ui_v1/widget/stack_widget.cc
${BA_SRC_ROOT}/ballistica/ui_v1/widget/stack_widget.h
${BA_SRC_ROOT}/ballistica/ui_v1/widget/text_widget.cc
Expand Down
2 changes: 2 additions & 0 deletions ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,8 @@
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\row_widget.h" />
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\scroll_widget.cc" />
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\scroll_widget.h" />
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\spinner_widget.cc" />
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\spinner_widget.h" />
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\stack_widget.cc" />
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\stack_widget.h" />
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\text_widget.cc" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1726,6 +1726,12 @@
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\scroll_widget.h">
<Filter>ballistica\ui_v1\widget</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\spinner_widget.cc">
<Filter>ballistica\ui_v1\widget</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\spinner_widget.h">
<Filter>ballistica\ui_v1\widget</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\stack_widget.cc">
<Filter>ballistica\ui_v1\widget</Filter>
</ClCompile>
Expand Down
2 changes: 2 additions & 0 deletions ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,8 @@
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\row_widget.h" />
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\scroll_widget.cc" />
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\scroll_widget.h" />
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\spinner_widget.cc" />
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\spinner_widget.h" />
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\stack_widget.cc" />
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\stack_widget.h" />
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\text_widget.cc" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1726,6 +1726,12 @@
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\scroll_widget.h">
<Filter>ballistica\ui_v1\widget</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\spinner_widget.cc">
<Filter>ballistica\ui_v1\widget</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ballistica\ui_v1\widget\spinner_widget.h">
<Filter>ballistica\ui_v1\widget</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ballistica\ui_v1\widget\stack_widget.cc">
<Filter>ballistica\ui_v1\widget</Filter>
</ClCompile>
Expand Down
2 changes: 1 addition & 1 deletion config/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cpplint==2.0.0
dmgbuild==1.6.2
dmgbuild==1.6.4
filelock==3.16.1
furo==2024.8.6
mypy==1.14.1
Expand Down
23 changes: 23 additions & 0 deletions src/assets/.asset_manifest_private.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"ba_data/audio/assassinFall.ogg",
"ba_data/audio/assassinHit1.ogg",
"ba_data/audio/assassinHit2.ogg",
"ba_data/audio/aww.ogg",
"ba_data/audio/bear1.ogg",
"ba_data/audio/bear2.ogg",
"ba_data/audio/bear3.ogg",
Expand Down Expand Up @@ -94,6 +95,7 @@
"ba_data/audio/cheer.ogg",
"ba_data/audio/click01.ogg",
"ba_data/audio/corkPop.ogg",
"ba_data/audio/corkPop2.ogg",
"ba_data/audio/cowboy1.ogg",
"ba_data/audio/cowboy2.ogg",
"ba_data/audio/cowboy3.ogg",
Expand All @@ -120,6 +122,7 @@
"ba_data/audio/dingSmallHigh.ogg",
"ba_data/audio/dripity.ogg",
"ba_data/audio/drumRoll.ogg",
"ba_data/audio/drumRollShort.ogg",
"ba_data/audio/error.ogg",
"ba_data/audio/explosion01.ogg",
"ba_data/audio/explosion02.ogg",
Expand All @@ -146,6 +149,7 @@
"ba_data/audio/frostyHit02.ogg",
"ba_data/audio/frostyHit03.ogg",
"ba_data/audio/fuse01.ogg",
"ba_data/audio/gasp.ogg",
"ba_data/audio/gladiator1.ogg",
"ba_data/audio/gladiator2.ogg",
"ba_data/audio/gladiator3.ogg",
Expand Down Expand Up @@ -217,6 +221,7 @@
"ba_data/audio/menuMusic.ogg",
"ba_data/audio/metalHit.ogg",
"ba_data/audio/metalSkid.ogg",
"ba_data/audio/nice.ogg",
"ba_data/audio/ninjaAttack1.ogg",
"ba_data/audio/ninjaAttack2.ogg",
"ba_data/audio/ninjaAttack3.ogg",
Expand Down Expand Up @@ -286,6 +291,7 @@
"ba_data/audio/raceBeep1.ogg",
"ba_data/audio/raceBeep2.ogg",
"ba_data/audio/refWhistle.ogg",
"ba_data/audio/revUp.ogg",
"ba_data/audio/robot1.ogg",
"ba_data/audio/robot2.ogg",
"ba_data/audio/robot3.ogg",
Expand Down Expand Up @@ -394,7 +400,11 @@
"ba_data/audio/wizardFall.ogg",
"ba_data/audio/wizardHit1.ogg",
"ba_data/audio/wizardHit2.ogg",
"ba_data/audio/woo.ogg",
"ba_data/audio/woo2.ogg",
"ba_data/audio/woo3.ogg",
"ba_data/audio/woodDebrisFall.ogg",
"ba_data/audio/wow.ogg",
"ba_data/audio/wrestler1.ogg",
"ba_data/audio/wrestler2.ogg",
"ba_data/audio/wrestler3.ogg",
Expand All @@ -403,6 +413,7 @@
"ba_data/audio/wrestlerFall.ogg",
"ba_data/audio/wrestlerHit1.ogg",
"ba_data/audio/wrestlerHit2.ogg",
"ba_data/audio/yeah.ogg",
"ba_data/audio/zoeAttack01.ogg",
"ba_data/audio/zoeAttack02.ogg",
"ba_data/audio/zoeAttack03.ogg",
Expand Down Expand Up @@ -1401,10 +1412,18 @@
"ba_data/textures/chestIconMulti.ktx",
"ba_data/textures/chestIconMulti.pvr",
"ba_data/textures/chestIconMulti_preview.png",
"ba_data/textures/chestIconTint.dds",
"ba_data/textures/chestIconTint.ktx",
"ba_data/textures/chestIconTint.pvr",
"ba_data/textures/chestIconTint_preview.png",
"ba_data/textures/chestIcon_preview.png",
"ba_data/textures/chestOpenIcon.dds",
"ba_data/textures/chestOpenIcon.ktx",
"ba_data/textures/chestOpenIcon.pvr",
"ba_data/textures/chestOpenIconTint.dds",
"ba_data/textures/chestOpenIconTint.ktx",
"ba_data/textures/chestOpenIconTint.pvr",
"ba_data/textures/chestOpenIconTint_preview.png",
"ba_data/textures/chestOpenIcon_preview.png",
"ba_data/textures/circle.dds",
"ba_data/textures/circle.ktx",
Expand Down Expand Up @@ -2398,6 +2417,10 @@
"ba_data/textures/sparks.ktx",
"ba_data/textures/sparks.pvr",
"ba_data/textures/sparks_preview.png",
"ba_data/textures/spinner.dds",
"ba_data/textures/spinner.ktx",
"ba_data/textures/spinner.pvr",
"ba_data/textures/spinner_preview.png",
"ba_data/textures/star.dds",
"ba_data/textures/star.ktx",
"ba_data/textures/star.pvr",
Expand Down
8 changes: 8 additions & 0 deletions src/assets/.asset_manifest_public.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@
"ba_data/python/baclassic/__pycache__/_appmode.cpython-312.opt-1.pyc",
"ba_data/python/baclassic/__pycache__/_appsubsystem.cpython-312.opt-1.pyc",
"ba_data/python/baclassic/__pycache__/_benchmark.cpython-312.opt-1.pyc",
"ba_data/python/baclassic/__pycache__/_chest.cpython-312.opt-1.pyc",
"ba_data/python/baclassic/__pycache__/_clienteffect.cpython-312.opt-1.pyc",
"ba_data/python/baclassic/__pycache__/_input.cpython-312.opt-1.pyc",
"ba_data/python/baclassic/__pycache__/_music.cpython-312.opt-1.pyc",
"ba_data/python/baclassic/__pycache__/_net.cpython-312.opt-1.pyc",
Expand All @@ -93,6 +95,8 @@
"ba_data/python/baclassic/_appmode.py",
"ba_data/python/baclassic/_appsubsystem.py",
"ba_data/python/baclassic/_benchmark.py",
"ba_data/python/baclassic/_chest.py",
"ba_data/python/baclassic/_clienteffect.py",
"ba_data/python/baclassic/_input.py",
"ba_data/python/baclassic/_music.py",
"ba_data/python/baclassic/_net.py",
Expand All @@ -107,6 +111,7 @@
"ba_data/python/bacommon/__pycache__/app.cpython-312.opt-1.pyc",
"ba_data/python/bacommon/__pycache__/assets.cpython-312.opt-1.pyc",
"ba_data/python/bacommon/__pycache__/bacloud.cpython-312.opt-1.pyc",
"ba_data/python/bacommon/__pycache__/bs.cpython-312.opt-1.pyc",
"ba_data/python/bacommon/__pycache__/build.cpython-312.opt-1.pyc",
"ba_data/python/bacommon/__pycache__/cloud.cpython-312.opt-1.pyc",
"ba_data/python/bacommon/__pycache__/loggercontrol.cpython-312.opt-1.pyc",
Expand All @@ -118,6 +123,7 @@
"ba_data/python/bacommon/app.py",
"ba_data/python/bacommon/assets.py",
"ba_data/python/bacommon/bacloud.py",
"ba_data/python/bacommon/bs.py",
"ba_data/python/bacommon/build.py",
"ba_data/python/bacommon/cloud.py",
"ba_data/python/bacommon/loggercontrol.py",
Expand Down Expand Up @@ -603,13 +609,15 @@
"ba_data/python/efro/dataclassio/__pycache__/_pathcapture.cpython-312.opt-1.pyc",
"ba_data/python/efro/dataclassio/__pycache__/_prep.cpython-312.opt-1.pyc",
"ba_data/python/efro/dataclassio/__pycache__/extras.cpython-312.opt-1.pyc",
"ba_data/python/efro/dataclassio/__pycache__/templatemultitype.cpython-312.opt-1.pyc",
"ba_data/python/efro/dataclassio/_api.py",
"ba_data/python/efro/dataclassio/_base.py",
"ba_data/python/efro/dataclassio/_inputter.py",
"ba_data/python/efro/dataclassio/_outputter.py",
"ba_data/python/efro/dataclassio/_pathcapture.py",
"ba_data/python/efro/dataclassio/_prep.py",
"ba_data/python/efro/dataclassio/extras.py",
"ba_data/python/efro/dataclassio/templatemultitype.py",
"ba_data/python/efro/debug.py",
"ba_data/python/efro/error.py",
"ba_data/python/efro/logging.py",
Expand Down
Loading

0 comments on commit 2190568

Please sign in to comment.