Commit Graph

15553 Commits (7fedff6111cf94332a0c3c9d50c820c53a04e5de)
 

Author SHA1 Message Date
Myk 3cf9ff7356
Merge pull request #4018 from xBlackTalonX/fix#3978-buildingplan-filter-editor-hotkey-conflict
Fix #3978 buildingplan filter editor hotkey conflict
2023-11-13 19:05:55 -08:00
Myk 54dd4c2bf5
Update changelog.txt 2023-11-13 18:59:14 -08:00
Black-Talon 2f15d258a7
changed buildingplan filterselection hotkey for reseting the filter to ctrl-x (from shift-x which conflicted with increasing the minimum quality) 2023-11-13 16:23:20 -07:00
vallode fcb69a1e7a Add to changelog 2023-11-13 08:46:36 +01:00
vallode 8fc232aba0 Merge branch 'develop' into world-module-docs 2023-11-13 08:25:19 +01:00
vallode e4c3144508 Include range information for month/day docs 2023-11-13 08:16:50 +01:00
DFHack-Urist via GitHub Actions a9f5c994aa Auto-update submodules
scripts: master
2023-11-13 07:13:49 +00:00
Myk Taylor c8878cb680
clean up changelog 2023-11-12 18:06:43 -08:00
DFHack-Urist via GitHub Actions 4f6ebf1ee1 Auto-update submodules
scripts: master
2023-11-13 01:58:18 +00:00
Myk e1472a00e8
Merge pull request #4017 from myk002/myk_burrow_flood
[burrow] refine flood fill algorithm
2023-11-12 16:34:26 -08:00
Myk Taylor 233deafd4e
ignore trees in burrow flood tile comparisons 2023-11-12 12:37:13 -08:00
vallode e70adf1692 Fix undefined labels 2023-11-12 21:16:28 +01:00
vallode b0729c78e8 Add world module documentation 2023-11-12 21:13:57 +01:00
Myk 38d8ec48e9
Merge pull request #4013 from myk002/myk_av_help
add guidance for installing on windows
2023-11-12 11:01:52 -08:00
DFHack-Urist via GitHub Actions f17e5c3fa0 Auto-update submodules
scripts: master
2023-11-12 10:26:18 +00:00
Myk ce3de1785f
Merge pull request #4014 from myk002/myk_burrow_flood
[burrow] allow 3d flood fill in hidden tiles
2023-11-12 02:25:33 -08:00
Myk Taylor 32ed6d6bcd
add guidance for installing on windows
to help avoid issues with antivirus
2023-11-12 01:47:44 -08:00
Myk 07c0590127
Merge pull request #4012 from myk002/myk_noleak
[sort] don't leak widgets into unrelated screens
2023-11-12 01:26:24 -08:00
Myk Taylor 52e0da5c33
don't leak widgets into unrelated screens 2023-11-12 00:47:48 -08:00
Myk 584cc2062c
Merge pull request #4006 from ToxicBananaParty/placesort
Port auto-resize code from info.lua
2023-11-12 00:35:01 -08:00
DFHack-Urist via GitHub Actions d5f8668e28 Auto-update submodules
library/xml: master
2023-11-12 07:13:06 +00:00
Ryan Dwyer de727d04d0 Better code reuse with info.lua 2023-11-10 13:56:14 -08:00
Ryan Dwyer 7ba3ebe7a0
Merge branch 'develop' into placesort 2023-11-10 13:25:55 -08:00
Ryan Dwyer 62ead4bbf1 Port auto-resize code from info.lua 2023-11-10 13:24:03 -08:00
Myk Taylor 186c5a1bb8
allow 3d flood fill in hidden tiles 2023-11-09 15:51:44 -08:00
Myk e86809dc4b
Merge pull request #4001 from myk002/myk_hawkowl
fix merge conflicts for PR #2555
2023-11-09 15:37:15 -08:00
Myk Taylor 255a1fc74f
Merge branch 'develop' into myk_hawkowl 2023-11-09 15:29:58 -08:00
Myk aba5ddb5b3
Merge pull request #3984 from ToxicBananaParty/placesort
Add search overlay to Locations page
2023-11-09 12:24:25 -08:00
Ryan Dwyer 8533f06efb Minor syntax fixes 2023-11-09 12:11:48 -08:00
Ryan Dwyer e6a6185627 Fix string concatenation syntax 2023-11-09 01:37:13 -08:00
Ryan Dwyer 5b8de86142 Implement suggested changes 2023-11-09 01:35:27 -08:00
Ryan Dwyer 78b7926d50 Make get_religion_string ifs more readable, add dwarfified profession string to get_profession_string 2023-11-09 01:34:47 -08:00
Ryan Dwyer 7516e6f268 Replace string comparison with df.is_instance 2023-11-08 17:44:40 -08:00
Ryan Dwyer 674bf94344 More code reuse with sort/locationselector 2023-11-08 17:36:31 -08:00
pre-commit-ci[bot] a21695ccc2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-08 20:43:26 +00:00
Ryan Dwyer fc7b8a2266 Merge branch 'placesort' of github.com:ToxicBananaParty/dfhack into placesort 2023-11-08 12:42:03 -08:00
Ryan Dwyer 217258b013 Better code reuse with locationselector.get_religion_string 2023-11-08 12:41:28 -08:00
Ryan Dwyer 6d5fad630d
Merge branch 'develop' into placesort 2023-11-08 12:35:39 -08:00
Myk 8a336b1a5a
Merge pull request #3983 from ToxicBananaParty/patch-1
Update Authors.rst
2023-11-08 08:14:29 -08:00
Ryan Dwyer f3e96d206c Add search overlay to Locations page 2023-11-08 03:25:47 -08:00
Ryan Dwyer dc0c42e995
Update Authors.rst 2023-11-08 02:09:03 -08:00
Myk c713c4d979
Merge pull request #3977 from ToxicBananaParty/placesort
Add search to Zones page
2023-11-08 00:59:30 -08:00
Ryan Dwyer 924c780210 Replace slashes with spaces for multi-named zones 2023-11-08 00:30:58 -08:00
Ryan Dwyer e58553fd0c Replace get_location_type_from_language_name with static language_name_type mapping 2023-11-07 21:29:27 -08:00
Ryan Dwyer 14d441344f Rename 'get_typestring_from_language_name' to 'get_location_type_from_language_name' 2023-11-07 12:55:55 -08:00
Ryan Dwyer fc2819ec1a Add get_typestring_from_language_name 2023-11-07 12:52:04 -08:00
Ryan Dwyer 4798dc6560 Fix nested if order of operations 2023-11-07 02:30:06 -08:00
pre-commit-ci[bot] 8b625e30db [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-07 10:26:04 +00:00
Ryan Dwyer 2162341e7f Implement myk002's proposed changes 2023-11-07 02:24:30 -08:00
Ryan Dwyer 5df373c3c5
Merge branch 'develop' into placesort 2023-11-07 00:00:33 -08:00