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
|
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
|
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 |
John Cosker
|
611e6d3a12
|
Merge branch 'develop' into design-refactor
|
2023-05-03 19:05:15 -04: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 |
|
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
|
fab05ca887
|
fix position of title overlay; force refresh on resize
|
2023-04-27 12:59:06 -07:00 |
|
Myk Taylor
|
6c88fa6440
|
don't output git hash on release builds
|
2023-04-24 16:12:37 -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 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
|
31401b2e19
|
fixed size limit calculations for rollers
|
2023-04-23 23:48:10 -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
|
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 |
|
Myk Taylor
|
250f05667b
|
add a warning when DT appears to be running
|
2023-04-18 15:50:59 -07:00 |
|
Myk Taylor
|
f6031e6a79
|
refactor existing logic to use new function
|
2023-04-17 13:04:42 -07:00 |
|
Myk Taylor
|
e9f6695ace
|
infrastructure for hiding armok tools
|
2023-04-17 09:39:15 -07:00 |
|
Myk Taylor
|
77c2458900
|
filter by gems (for windows)
|
2023-04-17 01:05:25 -07:00 |
|
Myk Taylor
|
ef380e9e1c
|
don't reset planner panel minimized state
|
2023-04-15 15:49:36 -07:00 |
|
Myk Taylor
|
20bea5fa21
|
add ability to filter by cloth and silk
|
2023-04-11 03:49:28 -07:00 |
|
Myk Taylor
|
51047367f4
|
fix index out of bounds error when reading gems
|
2023-04-10 23:28:00 -07:00 |
|
Myk Taylor
|
04c16186de
|
hide planner overlay during the tutorial
|
2023-04-10 04:24:00 -07:00 |
|
Myk Taylor
|
36db68deed
|
user longer text for weapon label
|
2023-04-07 02:17:22 -07:00 |
|
Myk Taylor
|
54c62a7307
|
tidy up
|
2023-04-07 02:08:47 -07:00 |
|
Myk
|
ec114bea7c
|
Merge branch 'develop' into bplan_planneroverlay
|
2023-04-07 01:14:06 -07:00 |
|
Taxi Service
|
6347e11751
|
moved prev/next on top, made set/edit filter button, more tweaks
|
2023-04-07 00:46:32 +02:00 |
|
Taxi Service
|
f66c60ee65
|
removed some trailing whitespace...
|
2023-04-06 16:22:07 +02:00 |
|
Taxi Service
|
70b8c83178
|
highlight selected item, + various tweaks
|
2023-04-06 16:08:09 +02:00 |
|
TaxiService
|
c490a9ebc2
|
updated comments in the footer area
|
2023-04-05 15:55:47 +02:00 |
|
Taxi Service
|
0c91644c5e
|
various tweaks and fixes
|
2023-04-04 22:34:47 +02:00 |
|
TaxiService
|
59b7947230
|
removed trailing whitespace...
|
2023-04-04 18:31:04 +02:00 |
|
Taxi Service
|
eda88a87ef
|
Merge branch 'bplan_itemselection' of https://github.com/TaxiService/dfhack into bplan_itemselection
|
2023-04-04 18:27:15 +02:00 |
|
TaxiService
|
e8e77e9ec2
|
Merge branch 'DFHack:develop' into bplan_itemselection
|
2023-04-04 18:25:54 +02:00 |
|
Taxi Service
|
aa8870fcad
|
custom EditField & reorganized panels
|
2023-04-04 17:38:38 +02:00 |
|
Taxi Service
|
8860ddf982
|
planneroverlay: initial rework commit
|
2023-04-03 22:46:31 +02:00 |
|
Taxi Service
|
ea9f3ef9d1
|
restored pens.lua (has nothing to do with itemselection)
|
2023-04-03 22:27:50 +02:00 |
|
Taxi Service
|
07a4da6573
|
reworked itemselection ui & added vertical divider pens
|
2023-04-03 22:23:32 +02:00 |
|
Taxi Service
|
d04780ee86
|
tweaked some item names shown on buildingplan uis
|
2023-04-03 20:38:57 +02:00 |
|
Taxi Service
|
935bc235b6
|
fixed vertical divider characters in ascii mode
|
2023-04-03 20:37:45 +02:00 |
|
Myk Taylor
|
55f7643381
|
use the defined constant instead of a magic number
|
2023-04-01 23:52:20 -07:00 |
|
Myk Taylor
|
9461e609a0
|
adjust text margin in hotkey menu for wide scrollbar
|
2023-04-01 22:53:35 -07:00 |
|
John Cosker
|
7ff9d73a4c
|
Technically drawing works
|
2023-03-30 15:17:08 -04:00 |
|
Myk Taylor
|
f2958a5529
|
implement automaterial selection for buildingplan
|
2023-03-28 23:51:52 -07:00 |
|
Myk
|
921e08e97a
|
Merge branch 'develop' into myk_buildingplan_suspendmanager
|
2023-03-28 06:52:42 -07:00 |
|
Myk Taylor
|
02b52fcb3d
|
confirm for removing burrows via the repaint menu
|
2023-03-27 16:11:21 -07:00 |
|
Myk Taylor
|
0ed311c108
|
allow exported orders files to be deleted from the import dialog
|
2023-03-27 03:52:12 -07:00 |
|
Myk Taylor
|
8da7e216a4
|
buildingplan - suspendmanager integration
|
2023-03-27 02:24:56 -07:00 |
|
Myk
|
2538324008
|
Merge pull request #3096 from ab9rf/5007-tailor
tailor: add inventory sanity check debug mode
|
2023-03-25 13:04:47 -07:00 |
|
Myk Taylor
|
42b18d001b
|
refresh overlay and helpdb on new world to pick up mod content
|
2023-03-25 12:56:54 -07:00 |
Kelly Kinkade
|
c8c0040678
|
tailor: add inventory sanity check debug mode
enable with "tailor debugging on" disable with "tailor debugging off"
this setting is not persisted
|
2023-03-25 14:56:04 -05:00 |
|
Myk
|
8b7223d1e2
|
Merge pull request #3086 from myk002/myk_buildingplan_no_filter_items
[buildingplan] allow player to choose any item when choosing items manually
|
2023-03-25 12:55:37 -07:00 |
|
Myk Taylor
|
a8822bdefa
|
take carved stairs into account when auto building stairs
|
2023-03-24 15:43:02 -07:00 |
|
Myk Taylor
|
c8f590cbac
|
allow player to choose any item when choosing items manually
that is, ignore the global and building-specific filters
|
2023-03-24 14:36:06 -07:00 |
|
Myk Taylor
|
99d050d0a8
|
respect building size limits
|
2023-03-24 14:06:39 -07:00 |
|
Myk Taylor
|
013c6fe02a
|
don't render footprint if we're minmized
|
2023-03-23 17:30:18 -07:00 |
|
Myk
|
4d540ba8ab
|
Merge pull request #3078 from myk002/myk_orders
add minimize button to orders overlay panel
|
2023-03-23 03:24:30 -07:00 |
|
Myk Taylor
|
9154a52d0a
|
remove spaces and dashes from allowed filename chars
since this will likely make it more difficult to represent stockpile
filenames in quickfort's stockpile configuration language
|
2023-03-23 02:26:37 -07:00 |
|
Myk Taylor
|
876425fbc8
|
allow multiple filters
|
2023-03-23 02:26:37 -07:00 |
|
Myk Taylor
|
06fa43932c
|
animals works
|
2023-03-23 02:26:37 -07:00 |
|
Myk Taylor
|
5a317820f9
|
new logic for deserialization
|
2023-03-23 02:26:37 -07:00 |
|
Myk Taylor
|
e21c55d6ff
|
update stockpiles command and use new data paths
|
2023-03-23 02:26:37 -07:00 |
|
Myk Taylor
|
90aed848bb
|
add minimize button to orders overlay panel
|
2023-03-23 02:26:00 -07:00 |
|
Myk Taylor
|
1984cf4469
|
remove unnecessary reload
|
2023-03-17 21:07:38 -07:00 |
|
Myk Taylor
|
b55a19f859
|
make the planner panel un-minimizable again
|
2023-03-17 21:07:25 -07:00 |
|
Myk Taylor
|
181b930070
|
allow inputs to pass through when minimized
|
2023-03-17 14:59:39 -07:00 |
|
Myk Taylor
|
79dd5a313f
|
rename Build button to Confirm and update docs
|
2023-03-17 09:58:20 -07:00 |
|
Myk Taylor
|
a9e853188c
|
better minimize widget for the planner panel
|
2023-03-17 08:33:55 -07:00 |
|
Myk Taylor
|
e95b6805d0
|
comment out heat safety feature
|
2023-03-16 19:55:12 -07:00 |
|
Myk Taylor
|
b0f9ad6449
|
add buildingplan reset for resetting all filters
|
2023-03-15 14:02:59 -07:00 |
|
Myk Taylor
|
73e65f2d94
|
use proper widgets for the minimize button
|
2023-03-15 13:40:34 -07:00 |
|
Myk Taylor
|
208a3e4ae8
|
add minimize/restore button
|
2023-03-15 01:19:34 -07:00 |
|
Myk Taylor
|
4be5ca4e81
|
filter by whether a slab is engraved
this actually adds an entirely new "specials" filter system that can be
extended later for other types
|
2023-03-15 00:29:27 -07:00 |
|
Myk
|
7edc686753
|
Merge pull request #3020 from myk002/myk_save_choice
[buildingplan] remember "choose items" choice per building type
|
2023-03-15 00:27:20 -07:00 |
|
Myk Taylor
|
4d8580d9e7
|
remember "choose items" choice per building type
|
2023-03-14 21:55:43 -07:00 |
|
Myk Taylor
|
039171e01d
|
support multiple upright spikes in a spike trap
|
2023-03-14 21:36:41 -07:00 |
|
Myk
|
63a7811ba5
|
Merge branch 'develop' into myk_buildingplan_clay
|
2023-03-12 15:59:48 -07:00 |
|
Myk Taylor
|
c48c9c77c0
|
use new data directories for blueprints
|
2023-03-12 15:43:32 -07:00 |
|
Myk Taylor
|
3798a7cb5e
|
allow clay to be chosen as a filter material
|
2023-03-12 15:13:57 -07:00 |
|
Myk Taylor
|
468b3b54d4
|
fix buildingplan typo
|
2023-03-11 15:36:47 -08:00 |
|
Myk Taylor
|
43b423cd31
|
make number of weapons in trap configurable
|
2023-03-10 01:44:33 -08:00 |
|
Myk
|
a37d2c09bf
|
Merge pull request #3001 from myk002/myk_buildingplan_pressure_plates
[buildingplan] fix handling of pressure plates
|
2023-03-10 00:17:57 -08:00 |
|
Myk Taylor
|
a3f8be3c01
|
fix pens reference
|
2023-03-10 00:12:56 -08:00 |
|
Myk Taylor
|
2f0dc4bd25
|
require correct number of mechanisms when building pressure plates
|
2023-03-10 00:09:12 -08:00 |
|
Myk Taylor
|
44fb91056b
|
ensure pressure plate config gets copied to the planned building
|
2023-03-09 23:41:13 -08:00 |
|
Myk Taylor
|
6373832490
|
refactor buildingplan into smaller files
|
2023-03-09 23:05:48 -08:00 |
|
Myk Taylor
|
bc77a91d46
|
build zero-item buildings with buildingplan
so they can be multi-built like all other buildings (the vanilla ui was
handling the build and then exiting out of the build menu)
|
2023-03-06 20:51:41 -08:00 |
|
Myk Taylor
|
161f84e7b7
|
turn down automaterial (superseded by buildingplan)
|
2023-03-06 01:27:27 -08:00 |
|
Myk Taylor
|
e9060624af
|
use same hotkey for sorting, hide unused elements
|
2023-03-05 23:04:35 -08:00 |
|
Myk Taylor
|
efb307ed25
|
remove mock warning
|
2023-03-05 22:09:45 -08:00 |
|
Myk Taylor
|
d009668339
|
implement materials search
|
2023-03-05 22:09:21 -08:00 |
|
Myk Taylor
|
ea549f6572
|
generate text summary as the filter changes
|
2023-03-05 19:15:04 -08:00 |
|
Myk Taylor
|
c752223fbc
|
implement invert and reset
|
2023-03-05 18:31:03 -08:00 |
|
Myk Taylor
|
2a2141931f
|
allow material filter to be read and set
|
2023-03-05 18:17:10 -08:00 |
|
Myk Taylor
|
d07864e5bb
|
allow material categories to be set from the ui
|
2023-03-05 16:32:05 -08:00 |
|
Myk Taylor
|
3b116c8061
|
give global settings page an interior frame
|
2023-03-05 16:32:05 -08:00 |
|
Myk Taylor
|
c8c1572bc4
|
fix typo
|
2023-03-02 06:08:51 -08:00 |
|
Myk Taylor
|
80da035186
|
always allow constructions to be placed
even if some tiles are invalid. the first selected tile must still be
valid
|
2023-03-02 06:00:21 -08:00 |
|
Myk Taylor
|
926bc8b7d4
|
cache valid materials on world load
|
2023-03-02 05:00:07 -08:00 |
|
Myk Taylor
|
97e5fdb78e
|
implement saving and retrieving item quality filters
|
2023-02-27 12:27:21 -08:00 |
|
Myk Taylor
|
1d855014c2
|
implement global settings page
|
2023-02-27 10:32:54 -08:00 |
|
Myk Taylor
|
9f794a0710
|
filter dialog mock, draft 2; implement Slider
|
2023-02-27 04:13:29 -08:00 |
|
Myk Taylor
|
9b8400ab40
|
prevent planned buildings from being resumed
note this only prevents unsuspending from the building sheet panel, not
the tasks screen
|
2023-02-26 23:45:15 -08:00 |
|
Myk Taylor
|
97ee1022c7
|
note that filter page is a mock
|
2023-02-26 10:55:50 -08:00 |
|
Myk Taylor
|
fbd3cd44d6
|
initial mock of filter dialog
|
2023-02-26 09:49:08 -08:00 |
|
Myk Taylor
|
f0ca7ad425
|
fix all buildings being identified as constructions
|
2023-02-26 09:49:08 -08:00 |
|
Myk Taylor
|
4b26454696
|
start of filters dialog
|
2023-02-26 09:49:08 -08:00 |
|
Myk Taylor
|
dadecdcf45
|
fix inspector screen not resetting the description
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
20a0390c50
|
no building shadow when other windows are up
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
097e955796
|
infrastructure for item filtering
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
a0798178a6
|
ensure item quantity is correct when hollow
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
c52b2c27c8
|
implement automaterial in buildingplan
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
4f2d86f50a
|
implement hollow area placement for constructions
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
1957ad4cdf
|
move the filter window a bit to the side, can pause
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
f09eeee864
|
only enable clear filter hotkey when a filter is set
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
69e9da2e79
|
keep target area higlighted while choosing items
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
348ac55f4c
|
allow singleton selection for items
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
e9555c29be
|
initialize heat safety option to 'Any'
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
273183e864
|
allow cancel when choosing items
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
a0785bded4
|
implement heat safety
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
2477a23972
|
pass correct job_item index for item selection
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
ee827f5ca1
|
remember mouse pos from before item choosing
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
4001ef3815
|
implement selecting specific items
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
66a14ecc74
|
get UI semi-finalized, prep for item choosing
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
daf691839f
|
item selection, callback skeleton
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
c59ad78f40
|
more tokens, textures, and colors
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
aa4ebe6398
|
remove some cruft
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
e92a54deaa
|
beginning of textures
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
b3198c88a0
|
only block mouse clicks over exactly the panel area
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
96fa7fa1e2
|
fix position of errors panel
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
3f8be2cd9e
|
implement make_top_priority, cache inspector data
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
0d3285678c
|
separate errors panel, fix pb vectors on load
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
56c8927316
|
better description string for inspection overlay
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
18ad29dde4
|
show queue position
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
e5c3a2b519
|
dynamically count available materials when placing
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
a9d9e0e50c
|
skeleton for quantity scanning
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
584e891154
|
more skeleton for inspector
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
dd6f71c665
|
handle stairs and 3 dimensions
|
2023-02-26 09:49:07 -08:00 |
|
Myk Taylor
|
1c3a5fa170
|
initial building placement code
|
2023-02-26 09:49:07 -08:00 |