Commit Graph

5351 Commits (6ad724b4831f19f46ae62bede574e1817c3ba21c)

Author SHA1 Message Date
Myk Taylor e80884459c
don't display dfhack logo in legends mode 2023-08-07 12:39:20 -07:00
lethosor 8dc13b8b25
check-structures-sanity: also skip temp_save vectors 2023-08-05 23:46:07 -04:00
lethosor 0abdf0148f
Merge branch 'develop' of DFHack/dfhack into develop 2023-08-05 17:03:29 -04:00
lethosor d152e86013
check-structures-sanity: Set debugger-friendly compiler options 2023-08-05 17:03:18 -04:00
Myk Taylor 3358a2b516
enable more tests 2023-08-04 20:40:33 -07:00
Myk Taylor 415a2f654b
update stonesense ref 2023-08-04 12:24:04 -07:00
Myk Taylor ec461bcce5
zero tests mean pass 2023-08-03 22:48:23 -07:00
lethosor 1411c5e8aa
Disable RPC API docs for plugins that aren't currently built
This allows ci/check-rpc.py to pass, and will cause it to fail if the plugins
are re-enabled and we forget to un-disable the docs.
2023-08-04 01:28:15 -04:00
lethosor 1f9b248f8a
check-structures-sanity: add no-op handler for std::map 2023-08-02 23:49:10 -04:00
lethosor a3916cdbb6
check-structures-sanity: update detection for GCC C++11 std::string 2023-08-01 01:54:35 -04:00
lethosor 0c6441619f
Re-enable build of check-structures-sanity 2023-08-01 00:59:52 -04:00
lethosor 94dae7a1f1
dts::make_unique -> std::make_unique in unbuilt plugins
Followup to #3537
2023-08-01 00:59:26 -04:00
lethosor 199191e9d4
Re-add BUILD_SUPPORTED flag so that devel plugins can be built by themselves 2023-08-01 00:52:22 -04:00
lethosor 031a61a436
Re-enable devel plugins that compile 2023-08-01 00:52:22 -04:00
Myk Taylor 6a50ae42ce
more deduplication of installed files 2023-07-29 00:35:12 -07:00
Myk Taylor ac633da050
de-duplicate stonesense resources 2023-07-29 00:35:12 -07:00
DFHack-Urist via GitHub Actions aaf511b5ea Auto-update submodules
plugins/stonesense: master
2023-07-29 07:12:04 +00:00
DFHack-Urist via GitHub Actions f3da973c09 Auto-update submodules
scripts: master
plugins/stonesense: master
2023-07-24 07:14:05 +00:00
Myk Taylor 383966511d
don't modify container while iterating 2023-07-21 17:45:45 -07:00
Myk Taylor ac8211a9c7
add autobutcher link to pasture screen 2023-07-21 14:35:59 -07:00
Myk 65fc79c5e2
Merge branch 'develop' into myk_dwarfvet 2023-07-21 14:23:13 -07:00
Myk Taylor dff4816287
update dwarfvet 2023-07-21 04:12:56 -07:00
Myk Taylor d14054716c
better name for overlay 2023-07-21 00:28:05 -07:00
Myk Taylor a77a6b5943
clean up globals 2023-07-20 19:40:40 -07:00
Myk Taylor d18a1f12f7
allow the color to override box select and cursor 2023-07-20 19:32:38 -07:00
Myk Taylor a6b304d9b4
fix box select bounds logic 2023-07-20 19:28:49 -07:00
Myk Taylor 2370750809
add warm/damp highlight overlay for ascii mode 2023-07-20 19:17:09 -07:00
Myk Taylor 7ec34ec5f8
remove unneeded linkage to SDL 2023-07-18 23:15:22 -07:00
Myk Taylor 9e720b2de7
properly handle animals in cages in non-cage buildings 2023-07-18 03:39:03 -07:00
Myk Taylor 27f1a4443c
rearrange pastures dialog according to feedback 2023-07-17 13:34:49 -07:00
Myk 62b311c6d7
Merge pull request #3575 from plule/cleanup_open_tiles
Remove redundant checks on open tiles
2023-07-17 12:59:23 -07:00
plule b8346cb069 Remove redundant checks on open tiles 2023-07-17 15:42:08 +02:00
Myk Taylor e1946018f8
use TextButton in zone overlay 2023-07-16 20:24:46 -07:00
Myk 2cd226d879
Merge pull request #3566 from myk002/myk_pasture
[zone] initial implementation of pasture assignment screen
2023-07-16 14:36:57 -07:00
Myk ce12cd6e29
colorize! 2023-07-16 14:22:10 -07:00
Myk Taylor a017700dc6
convert egg and graze sliders into tristates 2023-07-16 13:43:52 -07:00
Myk Taylor 5fb299c6df
expand egg-laying filter to the entire race, not just the unit 2023-07-16 12:30:12 -07:00
Myk Taylor b10ef79a29
tag units that are opposed to life as hostile 2023-07-16 12:16:45 -07:00
Myk Taylor 2fa4efbb8a
initial implementation of pasture assignment screen 2023-07-16 12:16:45 -07:00
Myk Taylor 39612f0d5a
trade a bin if any contents can be traded
the new trade screens will make it easy to filter out unwanted items
later
2023-07-16 12:15:51 -07:00
Myk Taylor 5c7aea0775
fix logic for autotrain and autotrade 2023-07-16 12:15:48 -07:00
Myk Taylor a820b95d8c
include exotic pets as tameable 2023-07-15 14:40:04 -07:00
Myk Taylor 6e565f3275
fix/update summaries 2023-07-09 15:42:43 -07:00
Kelly Kinkade 1fba8b16f5 replace `dts:make_unique` with `std::make_unique`
2014 here we come!
2023-07-07 21:38:15 -05:00
DFHack-Urist via GitHub Actions ad49c6735f Auto-update submodules
plugins/stonesense: master
2023-07-08 00:42:40 +00:00
Kelly Kinkade fb9e72e487 3dveins: ERR → WARN 2023-07-07 17:41:35 -05:00
Kelly Kinkade 4b669ec83a uncross eyes and try again 2023-07-07 15:51:36 -05:00
Kelly Kinkade d346bbfe6f 3dveins: satisfy gcc's overly aggressive linter 2023-07-07 15:51:36 -05:00
Kelly Kinkade 02a4b7f63f 3dveins: use debugfilter 2023-07-07 15:51:36 -05:00
Kelly Kinkade 9a58672190 reenable 3dveins 2023-07-07 15:51:36 -05:00
Kelly Kinkade 36c6c5ee93 3dveins - tradeoffs for v50
allow dropping orphan veins; this is necessitated by what appears to be a bug in the gem spire generation code, which appears to occasionally spew gems in places that are quite distant from the gem spires themselves
2023-07-07 15:51:36 -05:00
Myk 50b3cecfcf
Merge pull request #3481 from myk002/myk_cpp20
get compiling with c++-20
2023-07-05 22:28:59 -07:00
Myk Taylor 0b9f84a5da
don't print error if a building is not selected 2023-07-05 19:06:57 -07:00
Myk 8e7d7fefc0
Merge pull request #3527 from myk002/myk_no_extra_keys
filter out spurious STRING keybindings
2023-07-05 12:10:51 -07:00
Myk Taylor f111b69f2f
Merge branch 'develop' into myk_cpp20 2023-07-03 11:49:54 -07:00
Myk Taylor fdf2430fc4
filter out spurious STRING keybindings
that don't match actual SDL string input
2023-07-03 09:09:52 -07:00
Myk Taylor d39440d33b
migrate markForTrade logic from logistics to core 2023-07-02 19:05:50 -07:00
Myk Taylor 8f1efcd8a3
remove need to ignore warnings for dfhack-dependent targets 2023-06-25 17:44:06 -07:00
Myk Taylor 2a361ae796
re-enable faststart now that the DF race condition has been fixed 2023-06-23 14:36:27 -07:00
Myk 2101918158
Update pathable.cpp 2023-06-23 14:36:27 -07:00
Myk Taylor 840a2b3525
ensure DFHack screens get all string input 2023-06-23 14:36:18 -07:00
Myk Taylor 0790ace9fd
temporarily disable faststart
until DF no longer has a race condition
2023-06-23 14:36:17 -07:00
Myk Taylor 258b647ef6
extend the title version widget to show longer version strings 2023-06-23 14:36:17 -07:00
Taxi Service 3e2940ef8f
attempt to set optional tilesize arguments for load_texture() 2023-06-23 14:35:45 -07:00
Myk Taylor 4e48ce64f1
get things mostly ported to SDL2 2023-06-23 14:31:12 -07:00
Myk Taylor 5a90a04a8e
handle obsidian 2023-06-21 02:00:06 -07:00
Myk Taylor b571e5b52b
don't diplay orders overlay on subscreens 2023-06-19 16:48:07 -07:00
Myk 4a26dab8e5
Merge pull request #3478 from myk002/myk_buildingplan_artifact
[buildingplan] don't select artifacts as masterful quality
2023-06-17 09:27:48 -07:00
Myk Taylor 9562897258
move unchanging var out of loop 2023-06-17 05:41:11 -07:00
Myk Taylor dfeac78aae
don't select artifacts as masterful quality
artifacts no longer have the artifact quality rating
we need to check for the flag explicitly
2023-06-16 16:05:01 -07:00
Myk Taylor 8a3b01a261
move the minimize button, not the window 2023-06-14 16:06:00 -07:00
Myk Taylor b97ad55a98
shift the stockpiles overlay a bit to the left
to avoid overlapping the right-most column on some resolutions
2023-06-14 15:40:46 -07:00
Myk Taylor 856237cfd3
just display logistics options in stockpiles overlay
for now; until stockpile import/export dialogs are complete
2023-06-12 12:52:47 -07:00
Myk Taylor 12b2509781
implement autotrain 2023-06-12 12:28:39 -07:00
Myk Taylor e90de61cc1
remove the features feature; we can do it with quickfort properties 2023-06-12 10:59:13 -07:00
Myk Taylor 37b07bcee6
add skeleton for autotrain 2023-06-11 23:31:54 -07:00
Myk Taylor ff7a2945eb
finish merge 2023-06-11 23:15:03 -07:00
Myk Taylor eaf97c620a
fix merge error 2023-06-11 22:59:54 -07:00
Myk Taylor aa1c0f2071
redesign stockpiles overlay 2023-06-11 22:56:08 -07:00
Myk Taylor b7d4b8fed6
import and export logistics features 2023-06-11 22:56:07 -07:00
Myk Taylor 43fbd89c23
first step at saving features 2023-06-11 22:31:38 -07:00
Myk Taylor c8786b21a0
export dialog prototype 2023-06-11 22:28:03 -07:00
Myk Taylor 89dedd78ac
move minimize button to the bottom 2023-06-11 22:28:03 -07:00
Myk Taylor a481520efd
implement minimize button 2023-06-11 22:28:03 -07:00
Myk Taylor c6d9a426dd
wip 2023-06-11 22:28:03 -07:00
Myk Taylor 1231006f6c
start of minimize button 2023-06-11 22:28:03 -07:00
Myk Taylor 7beac6b4c2
add some hover action to the overlay 2023-06-11 22:28:03 -07:00
Myk Taylor 44f8f84bba
initial stockpiles overlay 2023-06-11 22:28:03 -07:00
Myk Taylor ecbc35b292
one line per stockpile 2023-06-11 22:28:03 -07:00
Myk Taylor 8ab9739cd6
case insensitive sorting 2023-06-11 22:28:03 -07:00
Myk Taylor 2b2d03b9b1
calculate and display global stats 2023-06-11 22:28:03 -07:00
Myk Taylor 8eb6226336
remove redundant 'virtual' attributes 2023-06-11 22:28:03 -07:00
Myk Taylor 5ffbb4d0ef
unify and update automelt/autotrade/autodump 2023-06-11 22:28:01 -07:00
plule c55ab745bb RemoteFortressReader: Fix a possible null pointer access on image descriptions 2023-06-10 22:05:14 +02:00
Myk Taylor efc4f277d9
clear item occupancy flags for channeled tiles 2023-06-06 08:06:56 -07:00
Myk Taylor 760cd0cbcb
implement tameable property filtering 2023-05-28 20:44:27 -07:00
Myk Taylor dbcba3d548
refactor to allow interacting with route stop settings 2023-05-28 02:26:06 -07:00
DFHack-Urist via GitHub Actions a9843912be Auto-update submodules
scripts: master
plugins/stonesense: master
2023-05-25 07:13:13 +00:00
DFHack-Urist via GitHub Actions 44340dfb75 Auto-update submodules
library/xml: master
scripts: master
plugins/stonesense: master
2023-05-24 07:12:57 +00:00
Myk Taylor d06118ad8e
support recording stockpiles in blueprints 2023-05-21 09:45:28 -07:00
Myk Taylor 3729d7daa4
encode transmitted names in utf-8 2023-05-19 19:51:51 -07:00
Myk 804a80ea98
Merge pull request #3396 from myk002/myk_autodump
[autodump] remove cursor guard so autodump destroy can work
2023-05-19 11:33:33 -07:00
Myk Taylor d4e8d3399b
remove cursor guard from autodump so autodump destroy can work 2023-05-18 16:56:22 -07:00
Myk d48f4844d6
Merge branch 'develop' into myk_title_launch 2023-05-18 16:38:19 -07:00
Myk Taylor d4f41141ef
fix game_extra reference 2023-05-17 16:45:35 -07:00
Myk Taylor 6aede45135
add links to quickstart-guide and gui/control-panel to the title screen 2023-05-17 11:56:49 -07:00
Myk c38e5e65e6
Merge pull request #3387 from myk002/myk_classic
Dynamically look up texture values instead of assuming they're constant
2023-05-17 11:52:41 -07:00
Myk 5268de8dd8
Merge branch 'develop' into myk_classic 2023-05-17 11:27:33 -07:00
Myk Taylor 9d8a825eb4
adjust usage to game structure reunification 2023-05-17 11:13:21 -07:00
Myk b787ee7aa5
Merge pull request #3379 from myk002/myk_rescan
[overlay] rename overlay.reload to overlay.rescan
2023-05-17 10:21:15 -07:00
Myk Taylor 11361975f9
look up texpos values instead of assuming they're constant 2023-05-16 17:14:36 -07:00
Myk Taylor a76bed0ed5
rename overlay.reload to overlay.rescan 2023-05-16 11:41:28 -07:00
Myk Taylor 910b7c2ae9
fix autolabor warning appearing on inappropriate screens 2023-05-15 17:52:20 -07:00
lethosor f9a946190d
Disable building title-folder again
Hangs when enabled in dfhack.init, at least under wine
2023-05-10 23:31:00 -04:00
lethosor cb2db50a64
Re-enable build of several plugins
Likely to still work, and were probably just disabled due to v50 changes:
- changeitem
- createitem
- deramp
- flows
- lair

and a couple that don't access DF data at all:
- luasocket
- title-folder
2023-05-09 22:13:49 -04:00
John Cosker 58e11b01cb Comments 2023-05-03 19:37:44 -04:00
John Cosker 611e6d3a12
Merge branch 'develop' into design-refactor 2023-05-03 19:05:15 -04:00
Myk 2e64cf4373
Merge branch 'develop' into myk_add_spatter 2023-05-02 17:10:43 -07:00
Myk c91268e50f
Merge branch 'develop' into myk_worknow 2023-05-02 16:35:26 -07:00
John Cosker be6f52c052 Merge branch 'design-refactor' of https://github.com/johncosker/dfhack into design-refactor 2023-05-01 14:24:40 -04:00
John Cosker 528dc466e2 address review comments 2023-05-01 14:20:53 -04:00
Myk Taylor 0d6c5869f4
fix logo disappearing when hovered on title screen 2023-04-30 16:40:03 -07:00
Myk 898a54e72f
Merge pull request #3330 from DFHack/5008-beta1
merge 5008 work into develop
2023-04-29 18:42:25 -07:00
John Cosker 065323ef74
Merge branch 'develop' into design-refactor 2023-04-28 11:17:39 -04:00
John Cosker 6b7c90b676 Working C++ and refactors 2023-04-27 22:37:56 -04:00
Myk Taylor 83fa87b492
add work-now to the build 2023-04-27 14:22:45 -07:00
Myk Taylor ef140b0dd6
rename and enable plugin 2023-04-27 13:20:25 -07:00
Myk Taylor fab05ca887
fix position of title overlay; force refresh on resize 2023-04-27 12:59:06 -07:00
Myk Taylor 1b8fc20ad5
check items for accessibility for dialogs
before we only checked when doing the cycle, so if an inaccessible item
were manually selected, we'd never be able to build
2023-04-26 21:01:21 -07:00
Myk b1ae39764b
Merge branch '5008-beta1' into myk_nosdlreal 2023-04-26 15:48:13 -07:00
Myk Taylor 9c447e8d45
re-add add-spatter plugin (minimal changes) 2023-04-26 14:47:24 -07:00
Myk Taylor 6c88fa6440
don't output git hash on release builds 2023-04-24 16:12:37 -07:00
Myk 359df08803
Merge branch 'develop' into myk_autoclothing 2023-04-24 14:16:42 -07:00
Myk d5e302bc0d
Merge pull request #3296 from myk002/myk_dig_now
[dig-now] fix smoothing job detection
2023-04-24 14:16:19 -07:00
Myk 2a410f7570
Merge pull request #3294 from myk002/myk_title_version
add DFHack title version overlay
2023-04-24 14:13:53 -07:00
Myk 99b6aa0f90
Merge branch 'develop' into myk_dig_now 2023-04-24 14:13:25 -07:00
Myk Taylor 2686c8f084
move DFHack version next to logo
and only display on the base title screen
2023-04-24 08:04:08 -07:00
Myk Taylor 65da8ef3c9
only display dfhack logo on base title screen
to avoid overlapping important widgets on subscreens
2023-04-24 08:03:31 -07:00
Myk Taylor ab047af163
demote chatty WARN messages to DEBUG 2023-04-24 00:31:20 -07:00
Myk Taylor 31401b2e19
fixed size limit calculations for rollers 2023-04-23 23:48:10 -07:00
Myk Taylor 74e1aa70d9
fix smoothing job detection 2023-04-23 23:28:50 -07:00
Myk f009ca907e
Merge pull request #3271 from TaxiService/bplan_slidertowidgets
move Slider class from filterselection.lua into widgets.lua
2023-04-23 18:44:58 -07:00
Myk Taylor b5459faffe
format version string in help the same way 2023-04-23 18:20:50 -07:00
Myk Taylor b59bf72cd2
turn down the title-version plugin 2023-04-23 17:32:30 -07:00
Myk Taylor 33142a5dfc
add DFHack title version overlay 2023-04-23 17:26:45 -07:00
Myk 7e9936f856
Merge branch 'develop' into myk_troll_Fur 2023-04-21 13:49:27 -07:00
Myk Taylor 6d9a07355b
allow filtering by yarn 2023-04-21 11:54:38 -07:00
Myk Taylor 6b86f7c691
planner panel is minimized by default
and minimized state is now persisted across reloads
2023-04-21 11:20:28 -07:00
Taxi Service 8371aa0b8b renamed Slider to RangeSlider, and added draft of Lua API.rst entry 2023-04-20 13:24:47 +02:00
Taxi Service ae2bdfad5f moved Slider class from filterselection.lua to widgets.lua 2023-04-19 11:28:57 +02:00