diff --git a/ROADMAP.md b/ROADMAP.md index 0b3978a..e0bf394 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -43,5 +43,8 @@ List of features that are currently worked on. ## Done Features/issues that are added/solved in specific version +- 4.1.2 + - laod correct level when using level selector screen + - 4.1.1 - 4.1.0 bugs: Keeps reverting to default ball when selecting "next" - https://github.com/dulvui/ball2box/issues/16 diff --git a/fdroid/export_presets.cfg b/fdroid/export_presets.cfg index ef4a362..e39b5a4 100644 --- a/fdroid/export_presets.cfg +++ b/fdroid/export_presets.cfg @@ -30,8 +30,8 @@ keystore/release="" keystore/release_user="" keystore/release_password="" one_click_deploy/clear_previous_install=false -version/code=61 -version/name="4.1.1" +version/code=62 +version/name="4.1.2" package/unique_name="com.simondalvai.ball2box" package/name="Ball2Box" package/signed=false diff --git a/game/assets/i18n/UltimateTossi18n.de.translation b/game/assets/i18n/UltimateTossi18n.de.translation index 31b28b4..52458f9 100644 Binary files a/game/assets/i18n/UltimateTossi18n.de.translation and b/game/assets/i18n/UltimateTossi18n.de.translation differ diff --git a/game/assets/i18n/UltimateTossi18n.en.translation b/game/assets/i18n/UltimateTossi18n.en.translation index 3a2fb12..6824228 100644 Binary files a/game/assets/i18n/UltimateTossi18n.en.translation and b/game/assets/i18n/UltimateTossi18n.en.translation differ diff --git a/game/assets/i18n/UltimateTossi18n.es.translation b/game/assets/i18n/UltimateTossi18n.es.translation index 2c26fe3..2947ae7 100644 Binary files a/game/assets/i18n/UltimateTossi18n.es.translation and b/game/assets/i18n/UltimateTossi18n.es.translation differ diff --git a/game/assets/i18n/UltimateTossi18n.it.translation b/game/assets/i18n/UltimateTossi18n.it.translation index 4702880..320908b 100644 Binary files a/game/assets/i18n/UltimateTossi18n.it.translation and b/game/assets/i18n/UltimateTossi18n.it.translation differ diff --git a/game/src/levels/base-level/LevelBase.gd b/game/src/levels/base-level/LevelBase.gd index 24ad2aa..c0494e9 100644 --- a/game/src/levels/base-level/LevelBase.gd +++ b/game/src/levels/base-level/LevelBase.gd @@ -94,11 +94,12 @@ func _on_Shop_back() -> void: func _on_Shop_select() -> void: - # menu animations - shop.hide() - animation_player.play("GoToMenu") - ball_setup() - get_tree().paused = false + # menu animations broken, since new level needs to be loaded +# shop.hide() +# animation_player.play("GoToMenu") +# ball_setup() +# get_tree().paused = false + get_tree().change_scene("res://src/levels/Level%s.tscn"%str(Global.current_level)) func ball_setup() -> void: diff --git a/metadata/en-US/changelogs/61.txt b/metadata/en-US/changelogs/61.txt index a77e2ff..b8d0dd2 100644 --- a/metadata/en-US/changelogs/61.txt +++ b/metadata/en-US/changelogs/61.txt @@ -1 +1 @@ -- fix always yellow ball bug on reset or level change +- fix always yellow ball bug on reset or level change diff --git a/metadata/en-US/changelogs/62.txt b/metadata/en-US/changelogs/62.txt new file mode 100644 index 0000000..d0eab17 --- /dev/null +++ b/metadata/en-US/changelogs/62.txt @@ -0,0 +1 @@ +- laod correct level when using level selector screen diff --git a/version b/version index cc13db7..4f765db 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.1.1-61 +4.1.2-62