From 63b225c5ecd8d87a02f15291b9bbd94186f11582 Mon Sep 17 00:00:00 2001 From: Ritiek Malhotra Date: Thu, 8 Sep 2022 23:01:09 +0530 Subject: [PATCH 1/2] Accept "fairydust" as an emit type in ba.emitfx() --- CHANGELOG.md | 1 + src/ballistica/python/methods/python_methods_gameplay.cc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70701bdf..dd70dfde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### 1.7.7 (build 20798, api 7, 2022-09-09) +- Accept "fairydust" as an emit type in `ba.emitfx()`. - Added `ba.app.meta.load_exported_classes()` for loading classes discovered by the meta subsystem cleanly in a background thread. - Improved logging of missing playlist game types. - Some ba.Lstr functionality can now be used in background threads. diff --git a/src/ballistica/python/methods/python_methods_gameplay.cc b/src/ballistica/python/methods/python_methods_gameplay.cc index 8b59b903..e1e9b397 100644 --- a/src/ballistica/python/methods/python_methods_gameplay.cc +++ b/src/ballistica/python/methods/python_methods_gameplay.cc @@ -327,6 +327,8 @@ auto PyEmitFx(PyObject* self, PyObject* args, PyObject* keywds) -> PyObject* { emit_type = BGDynamicsEmitType::kDistortion; } else if (!strcmp(emit_type_str, "flag_stand")) { emit_type = BGDynamicsEmitType::kFlagStand; + } else if (!strcmp(emit_type_str, "fairydust")) { + emit_type = BGDynamicsEmitType::kFairyDust; } else { throw Exception("Invalid emit type: '" + std::string(emit_type_str) + "'.", PyExcType::kValue); From dab32bc626d08c07db2d77bf24c525b74cb87d51 Mon Sep 17 00:00:00 2001 From: Ritiek Malhotra Date: Sat, 10 Sep 2022 17:57:24 +0530 Subject: [PATCH 2/2] Update bainternal sources hash --- assets/src/ba_data/python/._bainternal_sources_hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/._bainternal_sources_hash b/assets/src/ba_data/python/._bainternal_sources_hash index 4f6f8751..1e1473b6 100644 --- a/assets/src/ba_data/python/._bainternal_sources_hash +++ b/assets/src/ba_data/python/._bainternal_sources_hash @@ -1 +1 @@ -64954916459680243860176377055051806996 \ No newline at end of file +27855823406376609779797608591198912121 \ No newline at end of file