From 5ae7a58df0bb8a0128bbb0b7cdcfeeb334abb23a Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Wed, 4 Sep 2024 10:16:34 -0700 Subject: [PATCH 01/15] update for 50.14 --- CMakeLists.txt | 6 +++--- library/modules/Gui.cpp | 4 ++-- library/xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c69e3ead6..bc92f3b8cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,9 +7,9 @@ cmake_policy(SET CMP0074 NEW) project(dfhack) # set up versioning. -set(DF_VERSION "50.13") -set(DFHACK_RELEASE "r4") -set(DFHACK_PRERELEASE FALSE) +set(DF_VERSION "50.14") +set(DFHACK_RELEASE "beta") +set(DFHACK_PRERELEASE TRUE) set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_ABI_VERSION 2) diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index 184f405ae2..295e779a6b 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -258,7 +258,7 @@ DEFINE_GET_FOCUS_STRING_HANDLER(world) } static bool widget_is_visible(df::widget * w) { - return w && w->visibility_flags.bits.WIDGET_VISIBILITY_VISIBLE; + return w && w->flag.bits.WIDGET_VISIBILITY_VISIBLE; } static size_t get_num_children(df::widget * w) { @@ -700,7 +700,7 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode) newFocusString += "/ImageCreator"; focusStrings.push_back(newFocusString); } - if (game->main_interface.unit_selector.visibility_flags.bits.WIDGET_VISIBILITY_ACTIVE) { + if (game->main_interface.unit_selector.flag.bits.WIDGET_VISIBILITY_ACTIVE) { newFocusString = baseFocus; newFocusString += "/UnitSelector/"; newFocusString += enum_item_key(game->main_interface.unit_selector.context); diff --git a/library/xml b/library/xml index 86c5648f9e..1c9783e597 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 86c5648f9ed2cffdf08d105035b08ac0850c1f44 +Subproject commit 1c9783e59746a002c47942c2c2d804c9948245b7 From 70c2026f5cf86081ff36759be018e38d2d79913e Mon Sep 17 00:00:00 2001 From: myk002 Date: Wed, 4 Sep 2024 17:22:43 +0000 Subject: [PATCH 02/15] Auto-update structures ref --- library/xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/xml b/library/xml index 1c9783e597..559753cd36 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 1c9783e59746a002c47942c2c2d804c9948245b7 +Subproject commit 559753cd369e8b94f5ab329f104f17e586e9a82d From 1b78e555c8fe94fe1e3d08efdc83029fbe93fbdb Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:43:31 +0000 Subject: [PATCH 03/15] Auto-update submodules library/xml: master --- library/xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/xml b/library/xml index 53b334a03e..7ec88aae2d 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 53b334a03e06693ea78164cee8e1a410ee68fef3 +Subproject commit 7ec88aae2d9e115e23e47184a04c521ecb760db0 From ecd0275b21dddde99c56a6100a6fe25afc77aaca Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Wed, 25 Sep 2024 12:22:47 -0500 Subject: [PATCH 04/15] updates for 50.14-r1 --- CMakeLists.txt | 4 ++-- docs/changelog.txt | 18 ++++++++++++++++++ library/xml | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5817107a42..a060806b7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ project(dfhack) # set up versioning. set(DF_VERSION "50.14") -set(DFHACK_RELEASE "beta") -set(DFHACK_PRERELEASE TRUE) +set(DFHACK_RELEASE "r1") +set(DFHACK_PRERELEASE FALSE) set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_ABI_VERSION 2) diff --git a/docs/changelog.txt b/docs/changelog.txt index 656a31a8b0..e6baf71475 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -55,6 +55,24 @@ Template for new versions: ## New Features +## Fixes + +## Misc Improvements + +## Documentation + +## API + +## Lua + +## Removed + +# 50.14-r1 + +## New Tools + +## New Features + ## Fixes - `preserve-rooms`: don't reserve a room for citizens that you expel from the fort - `autobutcher`: fix regression in ordering of butcherable animals diff --git a/library/xml b/library/xml index 7ec88aae2d..9f7e9d1c2f 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 7ec88aae2d9e115e23e47184a04c521ecb760db0 +Subproject commit 9f7e9d1c2fa9348af3a4e50f9b692663fc01a6a2 From 5399d11b86dfe0e0db7fd1fab1cb389ef79e4ab6 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Wed, 25 Sep 2024 12:36:14 -0500 Subject: [PATCH 05/15] update library/xml for 50.14-r1 --- library/xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/xml b/library/xml index 9f7e9d1c2f..7ec88aae2d 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 9f7e9d1c2fa9348af3a4e50f9b692663fc01a6a2 +Subproject commit 7ec88aae2d9e115e23e47184a04c521ecb760db0 From 9108422a4804fdc4094dfbf9a9b1697f0835fc8b Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Thu, 26 Sep 2024 02:07:12 +0000 Subject: [PATCH 06/15] Auto-update submodules library/xml: master --- library/xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/xml b/library/xml index 7ec88aae2d..b3e6c8c79b 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 7ec88aae2d9e115e23e47184a04c521ecb760db0 +Subproject commit b3e6c8c79bab405319cfc9bf0b413d08660d5fbf From 4d3734a23d57b20a95090b20834673af55ea2caf Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Thu, 26 Sep 2024 12:07:37 +0000 Subject: [PATCH 07/15] Auto-update submodules library/xml: master --- library/xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/xml b/library/xml index b3e6c8c79b..0080760678 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit b3e6c8c79bab405319cfc9bf0b413d08660d5fbf +Subproject commit 008076067888b6746a66aa54402801a024df7fab From f3baa995846f78118da70314207016ba4d6e691b Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Thu, 26 Sep 2024 12:19:59 +0000 Subject: [PATCH 08/15] Auto-update submodules library/xml: master --- library/xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/xml b/library/xml index 0080760678..b934954796 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 008076067888b6746a66aa54402801a024df7fab +Subproject commit b934954796d1530c2d47de3feb76332118a59194 From 2cdb947df9c84c295338e361c6b5bf97ec7cca7b Mon Sep 17 00:00:00 2001 From: myk002 Date: Fri, 27 Sep 2024 04:27:29 +0000 Subject: [PATCH 09/15] Auto-update structures ref --- library/xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/xml b/library/xml index b934954796..fa8041d8cf 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit b934954796d1530c2d47de3feb76332118a59194 +Subproject commit fa8041d8cf0d4c05a49942ca5ebf40ed70125f5a From edc430d315c5009c52ec25a3481f600bdf8fcdc6 Mon Sep 17 00:00:00 2001 From: myk002 Date: Fri, 27 Sep 2024 05:27:10 +0000 Subject: [PATCH 10/15] Auto-update structures ref --- library/xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/xml b/library/xml index fa8041d8cf..8db66a097d 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit fa8041d8cf0d4c05a49942ca5ebf40ed70125f5a +Subproject commit 8db66a097d6467e608c9e7c4f378ca0a5b153b0f From 72fde34efd6427769d84a9603c022970d51a56a1 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Thu, 26 Sep 2024 22:31:14 -0700 Subject: [PATCH 11/15] bump version to 50.14-r1.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a060806b7e..242cb293e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(dfhack) # set up versioning. set(DF_VERSION "50.14") -set(DFHACK_RELEASE "r1") +set(DFHACK_RELEASE "r1.1") set(DFHACK_PRERELEASE FALSE) set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") From 1dd79f52d7b988ca762c43848253760c1e99457d Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 27 Sep 2024 03:42:09 -0700 Subject: [PATCH 12/15] add something to the changelog so the version shows up --- docs/changelog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index e6baf71475..da939259e9 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -69,6 +69,11 @@ Template for new versions: # 50.14-r1 +# Fixes +- Compatibility with updated Classic and Itch builds + +# 50.14-r1 + ## New Tools ## New Features From fef0fcd199c54fc98c8b9d0456ee4d62c84349a0 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 27 Sep 2024 03:56:39 -0700 Subject: [PATCH 13/15] use correct version in header --- docs/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index da939259e9..aae5be7433 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -67,7 +67,7 @@ Template for new versions: ## Removed -# 50.14-r1 +# 50.14-r1.1 # Fixes - Compatibility with updated Classic and Itch builds From c3f7951bd542ea9600f8796c86b15711fc00d4c5 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 27 Sep 2024 04:04:41 -0700 Subject: [PATCH 14/15] r1.1 isn't generating a changelog; use future --- docs/changelog.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index aae5be7433..57014bdc8c 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -56,6 +56,7 @@ Template for new versions: ## New Features ## Fixes +- Compatibility with updated Classic and Itch builds ## Misc Improvements @@ -67,11 +68,6 @@ Template for new versions: ## Removed -# 50.14-r1.1 - -# Fixes -- Compatibility with updated Classic and Itch builds - # 50.14-r1 ## New Tools From 8354cee565d0e568ee32778d4cde651bee118ae7 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 27 Sep 2024 04:22:29 -0700 Subject: [PATCH 15/15] remove temporary changelog line --- docs/changelog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index 57014bdc8c..e6baf71475 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -56,7 +56,6 @@ Template for new versions: ## New Features ## Fixes -- Compatibility with updated Classic and Itch builds ## Misc Improvements