Commit Graph

13529 Commits (e4596e6d2ea87d6d25b39e7ff6e168570a21ccff)
 

Author SHA1 Message Date
lethosor 85dfe2a547
Merge remote-tracking branch 'cjhammel/fix-for-Issue-#2864' into develop 2023-02-16 11:49:36 -05:00
Myk 070e10a75a
Merge pull request #2875 from robob27/tabs-as-widgets
Add Tab/TabBar to widgets
2023-02-16 00:53:13 -08:00
Robob27 bc47a0b2e4 More prescriptive docs attempt 2023-02-16 03:14:05 -05:00
Myk c077343a23
Merge pull request #2904 from robob27/confirm-persist
Persist confirm config
2023-02-16 00:09:32 -08:00
Robob27 4167c2e652 Add key_back, rename switch_tab_key to key 2023-02-16 02:56:52 -05:00
Robob27 5154eb181a Add Tab/TabBar to widgets 2023-02-16 02:51:09 -05:00
Myk 00428a9140
Merge pull request #2910 from silverflyone/develop
Not all stockpile items being returned for getStockpileContents.
2023-02-15 23:33:39 -08:00
DFHack-Urist via GitHub Actions 36935056ea Auto-update submodules
library/xml: master
scripts: master
2023-02-16 07:15:08 +00:00
silverflyone 3ad66d5c2f
Merge branch 'develop' into develop 2023-02-16 15:05:23 +11:00
silverflyone 648af1c81c Buildings::StockpileIterator operator change added to FIxes. 2023-02-16 15:03:09 +11:00
silverflyone 80972466a4 Revert "Buildings::StockpileIterator operator change added to FIxes."
This reverts commit 8f190247e9.
2023-02-16 15:01:11 +11:00
silverflyone 8f190247e9 Buildings::StockpileIterator operator change added to FIxes. 2023-02-16 14:55:00 +11:00
Robob27 b4bd806134 Don't enable confirms on plugin enable 2023-02-15 16:10:22 -05:00
Robob27 8e577e7469 Persist confirm config 2023-02-15 16:01:17 -05:00
Kelly Kinkade 82cc486442 correct autolabor for structure update
df-structures#561 changed def'n of `activity_info` which autolabor used
2023-02-15 06:49:00 -06:00
DFHack-Urist via GitHub Actions 39f13b642f Auto-update submodules
library/xml: master
scripts: master
2023-02-15 07:15:04 +00:00
silverflyone d8afb6c682 Update Buildings.cpp
Changed the StockpileIterator::operator++ to checks block based on <= 16 rather than <16. Previously it was not returning items at stockpile tiles at the block boundary. Identified as part of combine.lua changes.
2023-02-15 15:31:50 +11:00
Christopher J Hammel c4aa936c0d
Update autolabor.cpp 2023-02-14 11:37:22 -05:00
Myk 805d68017f
Merge pull request #2905 from myk002/myk_mouse
prevent mouse clicks from bleeding through when a window is dismissed
2023-02-14 06:46:43 -08:00
DFHack-Urist via GitHub Actions 66229bb669 Auto-update submodules
library/xml: master
scripts: master
2023-02-14 07:15:30 +00:00
Myk Taylor bc76fd02e2
prevent mouse clicks from bleeding through when a window is dismissed 2023-02-13 17:35:02 -08:00
Myk c1f62f4985
Merge pull request #2859 from kelvie/getSelectedCivZone
Add getSelectedCivZone to dfhack.gui
2023-02-13 16:21:24 -08:00
Kelvie Wong f8d94afb7d Add getSelectedCivZone to dfhack.gui
Mostly helpful for my own automation in my custom lua scripts.

Tested it with barracks, meeting areas, and pastures.
2023-02-13 15:22:33 -08:00
Myk Taylor 6202b29c56
adapt autolabor to new split game structure 2023-02-13 13:39:28 -08:00
DFHack-Urist via GitHub Actions 2fe0d8932e Auto-update submodules
library/xml: master
scripts: master
2023-02-13 21:29:24 +00:00
Myk f22856bdda
Merge pull request #2900 from myk002/myk_zscreen
refine ZScreen behavior around pausing, update docs
2023-02-13 13:14:17 -08:00
Myk 14e303d2c3
Merge branch 'develop' into myk_zscreen 2023-02-13 13:14:00 -08:00
Myk 9c58b22913
Merge pull request #2894 from myk002/myk_autochop
generate names for nameless burrows; check for nil
2023-02-13 13:13:34 -08:00
Myk fbabe5cdb0
Merge pull request #2898 from myk002/myk_showmood
[showmood] show more understandable units for bars and cloths
2023-02-13 13:13:24 -08:00
Myk fc7e9885f0
Merge pull request #2899 from myk002/myk_strangemood
get strangemood compiling and running
2023-02-13 13:12:59 -08:00
Myk Taylor e5072a4f64
check for settings in the ATTRS, not the args 2023-02-13 09:28:14 -08:00
Myk Taylor 853859e119
refine ZScreen behavior around pausing, update docs 2023-02-13 09:09:39 -08:00
Myk Taylor 2b3dcee4b0
get strangemood compiling and running 2023-02-13 01:18:45 -08:00
Myk Taylor 68d314c9c0
show more understandable units for bars and cloths 2023-02-13 01:17:57 -08:00
Myk 8dd938c5a6
Merge pull request #2891 from robob27/filteredlist-on-change
Add edit_on_change to FilteredList
2023-02-12 18:41:41 -08:00
Myk Taylor 766738e102
generate names for nameless burrows; check for nil 2023-02-12 15:21:10 -08:00
Rob Goodberry 8d63757eea
Update docs/changelog.txt
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-12 18:01:35 -05:00
Myk d49898d7bf
Merge pull request #2885 from myk002/myk_seedwatch
properly store the id of seed targets in persisted state
2023-02-12 14:53:40 -08:00
Myk 4bc6e1bec0
Merge branch 'develop' into myk_seedwatch 2023-02-12 14:48:40 -08:00
DFHack-Urist via GitHub Actions 2a04abb1cb Auto-update submodules
library/xml: master
scripts: master
2023-02-12 22:47:20 +00:00
Robob27 7651f6a91e Add edit_on_change to FilteredList 2023-02-12 17:44:19 -05:00
Myk 769d30064b
Merge pull request #2890 from hobotron-df/issue2888-autodump-flags
[issue-2888] Don't change dump and forbid flags on failed autodump
2023-02-12 14:30:46 -08:00
Myk 1b8565544e
Update docs/changelog.txt 2023-02-12 14:28:37 -08:00
Batt Mush 5c457fc96f [issue-2888] autodump now conditionally removes an item's dump flag and
sets forbid flag IFF the item is successfully dumped. Otherwise, the
item's original flags are kept intact. This avoids impacting any tasks
associated with the item.
2023-02-12 15:49:40 -06:00
Myk Taylor 0c989634ab
properly store the id of seed targets in persisted state 2023-02-12 03:19:31 -08:00
Myk 50e9ad93f3
Merge pull request #2869 from robob27/moar-units-checks
Add isGeldable, isMarkedForGelding and isPet
2023-02-12 01:27:37 -08:00
Myk 53f394ce73
Merge pull request #2872 from dawnmist/bugfix/issue-2871
Autobutcher check for nickname field being set - fix for #2871
2023-02-12 01:25:34 -08:00
Janeene Beeforth 4b5836b996 Fix for #2871
* Add check for unit->name.nickname field is not an empty string
* Refactor repeated checks for inappropriate and protected units
2023-02-12 16:43:33 +11:00
DFHack-Urist via GitHub Actions 6b4c1e7787 Auto-update submodules
library/xml: master
2023-02-12 01:53:03 +00:00
Robob27 65f38ec75c Add isGeldable, isMarkedForGelding, isPet 2023-02-11 05:44:45 -05:00