Myk Taylor
|
25600e45b0
|
support melting masterworks in logistics
|
2023-10-06 18:25:24 -07:00 |
|
Myk Taylor
|
5d295400d2
|
centralize management of mouse state
|
2023-10-01 16:28:18 -07:00 |
|
Myk Taylor
|
6e2adaa3a9
|
don't conflict with macro recording key
|
2023-09-30 23:31:56 -07:00 |
Myk
|
424f242823
|
Merge branch 'develop' into work_orders_manager_enhancement
|
2023-09-29 09:43:19 -07:00 |
|
Myk
|
7b87219657
|
Update plugins/lua/orders.lua
|
2023-09-29 09:40:52 -07:00 |
Mikhail Panov
|
51173fb9fe
|
Removed material and job type sortings.
|
2023-09-29 17:34:48 +03:00 |
|
Myk Taylor
|
bff1b5e7b0
|
make the ascii DFHack logo easier to read
|
2023-09-28 14:41:30 -07:00 |
|
Myk Taylor
|
09129ddec0
|
brighten ascii logo on hover
as was originally intended. why is fg "de-bolded" by pens?
|
2023-09-28 13:56:11 -07:00 |
|
Myk
|
da77be29be
|
Merge pull request #3816 from myk002/myk_remousify
align mouse button semantics to DF
|
2023-09-26 19:09:23 -07:00 |
|
Mikhail Panov
|
1e4e6ed03f
|
Merge remote-tracking branch 'main_repository/develop' into combat_skill_rating_polishing
|
2023-09-26 17:42:27 +03:00 |
|
Myk Taylor
|
eefd38c66c
|
align mouse button semantics to DF
we, um, had it backwards
|
2023-09-26 03:52:24 -07:00 |
shevernitskiy
|
be26449ef7
|
ugh
|
2023-09-24 13:22:20 +03:00 |
|
shevernitskiy
|
bb5e178756
|
fix eof
|
2023-09-24 13:19:48 +03:00 |
|
shevernitskiy
|
9f4f14d025
|
put back unformatted hotkeys
|
2023-09-24 13:18:58 +03:00 |
|
shevernitskiy
|
f4348095a3
|
upstream
|
2023-09-24 11:45:07 +03:00 |
|
shevernitskiy
|
6f26650255
|
reserved texpos range
|
2023-09-24 11:44:03 +03:00 |
|
Mikhail Panov
|
a236722a75
|
Changed hotkeys + orders.cpp compilation error fix.
|
2023-09-22 18:37:14 +03:00 |
|
Mikhail Panov
|
9c866d5134
|
Merge remote-tracking branch 'main_repository/develop' into work_orders_manager_enhancement
|
2023-09-22 18:30:21 +03:00 |
|
Mikhail Panov
|
a500233e0b
|
Moved onde order recheck to orders plugin.
|
2023-09-22 18:29:45 +03:00 |
Mikhail
|
8826c27fa0
|
Changed 'reset' to recheck for clarity.
|
2023-09-18 13:41:02 +03:00 |
|
Mikhail
|
68d94ad715
|
Removed redundant uppercase in mental stability formula. Reworked thresholds for combat skill effectiveness formulas to have a higher 100 cap (more descriptive about very strong warriors).
|
2023-09-18 12:49:36 +03:00 |
|
Mikhail
|
7d3786586a
|
Reverted sort.lua. Changed orders sort by material keybing from T to M.
|
2023-09-18 12:28:34 +03:00 |
|
Mikhail
|
69be3be359
|
Added sorting by job type and by material for manager orders. Added shortcuts to the manager menu for new functions.
|
2023-09-16 14:18:06 +03:00 |
|
Mikhail
|
28b00d9f21
|
Tweaked military formula to be more informative about strong warriors. Added options to sort and reset manager orders to the 'o' screen.
|
2023-09-16 01:24:47 +03:00 |
|
Myk Taylor
|
fc88bfcbbc
|
don't close the logo menu on mouseout
now that we no longer open on hover, it doesn't make as much sense, and
the behavior can be frustrating when the mouse is moved unintentionally
|
2023-09-14 11:46:30 -07:00 |
|
Myk Taylor
|
04999cae8d
|
unbreak Ctrl-Shift-C
|
2023-09-14 10:43:35 -07:00 |
|
Myk Taylor
|
3634075df0
|
make DFHack logo glow on hover
|
2023-09-14 10:12:25 -07:00 |
|
Myk Taylor
|
b6c4eb7701
|
realign tooltip ids in confirm
|
2023-09-14 09:59:51 -07:00 |
|
Myk Taylor
|
b11a3ead1e
|
make DFHack logo respond to clicks, not mouseover
|
2023-09-14 01:31:19 -07:00 |
|
Myk Taylor
|
d9cae63e4e
|
move dfhack logo over a little
|
2023-09-13 18:02:44 -07:00 |
|
Myk Taylor
|
a0919ec316
|
add ASCII-mode highlight for smoothing and carving designations
|
2023-09-10 05:29:55 -07:00 |
|
Myk Taylor
|
45e5168a91
|
ensure face textures get reloaded on map load
|
2023-09-09 07:20:59 -07:00 |
|
Myk Taylor
|
9d233e6e34
|
unify stress face pens and rewrite arrival sort docs
|
2023-09-09 07:00:17 -07:00 |
|
Myk
|
b8ad8379ef
|
Merge pull request #3747 from myk002/myk_sort_squad_v2
[sort] squad screen v2
|
2023-09-08 21:12:18 -07:00 |
|
Myk
|
c60d6db36b
|
Merge pull request #3752 from myk002/myk_overlay
[overlay] allow widgets to bump their version and reset their saved settings
|
2023-09-08 21:10:40 -07:00 |
|
Myk Taylor
|
a061a418a1
|
allow reset to defaults by changing version attribute
|
2023-09-08 20:25:20 -07:00 |
|
Myk Taylor
|
8f1889edf2
|
increment overlay widget version so pos is reset
|
2023-09-08 20:22:44 -07:00 |
|
Myk Taylor
|
1e9e38a0de
|
implement ratings for arrival order
|
2023-09-08 20:06:51 -07:00 |
|
Myk Taylor
|
603f1b16c2
|
use stress face icons for stress and training need
|
2023-09-08 18:48:05 -07:00 |
|
Myk Taylor
|
5f32042f1a
|
adjust colorization of ratings
move mental stability from a sort to a filter
|
2023-09-08 16:44:59 -07:00 |
|
Myk Taylor
|
0d366740e7
|
move the dimensions readout out from under the heat safety filter
|
2023-09-07 18:29:29 -07:00 |
|
Myk Taylor
|
d0f08dcc0d
|
implement rating overlay
|
2023-09-07 16:14:20 -07:00 |
|
Myk Taylor
|
f0b0c2093b
|
flatten sort functions
|
2023-09-07 11:30:08 -07:00 |
|
Myk Taylor
|
229e7aef87
|
enable filtering by race
|
2023-09-05 17:50:17 -07:00 |
|
Myk
|
29ccdcf4b9
|
Remove leftover debug print
|
2023-09-04 20:45:53 -07:00 |
|
Myk Taylor
|
1d6ae37a66
|
fix and reinstate heat safety filter
|
2023-09-03 11:54:32 -07:00 |
|
Myk Taylor
|
a2b50a88a5
|
reorder branches for better readability
|
2023-09-03 07:12:41 -07:00 |
|
Myk Taylor
|
6096165eee
|
fix handling of ticks parameter
|
2023-09-02 02:03:03 -07:00 |
|
Myk Taylor
|
426099f82b
|
label updates for squad sort options
|
2023-09-01 14:35:55 -07:00 |
|
Myk Taylor
|
702992b6f5
|
hide the DFHack logo while loading a game
so the textures don't visibly flicker
revert this once textures are flicker free
|
2023-08-31 23:06:05 -07:00 |
|
Myk Taylor
|
ffc884d69d
|
fix migrant wave ordering
use active index instead of unit id
|
2023-08-31 19:42:02 -07:00 |
|
Myk Taylor
|
52543f9fc0
|
clean out unused code/vars
|
2023-08-31 19:14:47 -07:00 |
|
Myk Taylor
|
afb26b9ddd
|
add requested filters for squad assignment screen
and redo layout as a vertical panel since there's not enough space
otherwise
|
2023-08-31 19:10:18 -07:00 |
|
Myk
|
07e8e83837
|
Merge pull request #3698 from Halifay/advanced_military_sorting
Enhancing Military Candidate Selection
|
2023-08-30 23:52:18 -07:00 |
|
Myk
|
4a788e79c3
|
Apply suggestions from code review
|
2023-08-30 23:26:03 -07:00 |
|
Mikhail
|
2c97ab9c8d
|
Tidying up melee skill and ranged skill funcitons in sort.lua.
|
2023-08-30 17:16:59 +03:00 |
|
Mikhail
|
26b81cfbbd
|
Merged military rating back into one. Adjusted formulas for melee and ranged rating. Added skill effectiveness ratings for ranged and melee. Changed any melee and any ranged to skill effectiveness ratings. Added info about new ratings and research links to the docs.
|
2023-08-30 09:39:13 +03:00 |
|
Myk
|
a740c6628e
|
Merge pull request #3663 from shevernitskiy/dynamic-texture-loading
feat: dynamic texture loading
|
2023-08-27 22:45:52 -07:00 |
|
shevernitskiy
|
4fb6b09b30
|
move textures to separate lua module
|
2023-08-28 06:58:30 +03:00 |
|
Mikhail
|
c91a02ca6a
|
Reworked fallback from rating sortings. Renamed melee potential to solo combat potential. Added group combat potential.
|
2023-08-27 17:52:09 +03:00 |
pre-commit-ci[bot]
|
6fcbf48c84
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-25 13:28:37 +00:00 |
|
Mikhail
|
493be93a4c
|
Fixing conflicts.
|
2023-08-25 16:26:32 +03:00 |
|
Mikhail
|
25f2c1746a
|
Changed melee and ranged ratings to statistically proven linear formulas.
|
2023-08-25 16:18:20 +03:00 |
|
pre-commit-ci[bot]
|
771d7f6c6c
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-24 15:49:54 +00:00 |
|
Mikhail
|
30488dc310
|
Trailing space again. My bad.
|
2023-08-24 18:47:42 +03:00 |
|
Mikhail
|
aef60649fe
|
Trim trailing whitespace.
|
2023-08-24 17:18:46 +03:00 |
|
Mikhail
|
a1d68286cd
|
Added melee rating, ranged rating, mental stability rating and stress to sorting options on military screen in sort.lua. Added info about new sorting methods to sort.rst. Added name to Authors.rst.
|
2023-08-24 16:26:09 +03:00 |
|
Myk
|
4f247b79f1
|
Merge pull request #3684 from myk002/myk_sort_by_race
[zone] offer sort by race on animal assignment screen
|
2023-08-19 02:20:10 -07:00 |
|
Myk Taylor
|
8b91e84944
|
offer sort by race on animal assignment screen
|
2023-08-18 19:28:24 -07:00 |
|
Myk Taylor
|
d9fa827b20
|
support overlays on the load arena screen
|
2023-08-18 19:27:12 -07:00 |
|
Myk Taylor
|
2620bfbb43
|
tweak color and layout
|
2023-08-16 06:07:19 -07:00 |
|
Myk Taylor
|
7544641377
|
first draft of squad assignment search and sort
|
2023-08-16 06:07:19 -07:00 |
|
shevernitskiy
|
bbbb8fbb9c
|
invalid texpos is nil now
|
2023-08-15 21:18:52 +03:00 |
|
Myk Taylor
|
a521b54da1
|
normalize input for animal assignment search
|
2023-08-14 16:38:43 -07:00 |
|
shevernitskiy
|
0e725be046
|
support closure as tile arg to get texpos
|
2023-08-14 12:07:27 +03:00 |
|
shevernitskiy
|
91f4c3d561
|
mirgate preloaded assets to lua
|
2023-08-14 08:17:57 +03:00 |
|
shevernitskiy
|
1409af67de
|
expose api to lua
|
2023-08-13 20:09:12 +03:00 |
|
Myk Taylor
|
463a8647e6
|
complete vermin and small animal support
|
2023-08-13 02:45:04 -07:00 |
|
Myk Taylor
|
296a34834c
|
expose and use casteFlagSet
|
2023-08-13 00:20:08 -07:00 |
|
Myk Taylor
|
93ed45d6e7
|
handle small pets, similar to vermin
|
2023-08-12 23:29:45 -07:00 |
|
shevernitskiy
|
20460fecca
|
tiny refactor texpos methods
|
2023-08-13 07:40:35 +03:00 |
|
shevernitskiy
|
4bc3a9b552
|
single quotes
|
2023-08-13 07:36:39 +03:00 |
|
shevernitskiy
|
fe8bd4fa78
|
assets use dynamic texture loading
|
2023-08-12 16:11:42 +03:00 |
|
Myk Taylor
|
214b78ba3c
|
add unit assignment screens for pits/cages/chains
refactor the existing Pasture assignment screen to handle variations
|
2023-08-11 18:32:52 -07:00 |
|
Myk
|
139a3a5ae8
|
Merge pull request #3649 from myk002/myk_bannerpanel
[widgets] factor banner out into reusable panel class
|
2023-08-07 12:54:32 -07:00 |
|
Myk Taylor
|
8c166935d5
|
factor banner out into reusable panel class
|
2023-08-07 12:40:48 -07:00 |
|
Myk Taylor
|
e80884459c
|
don't display dfhack logo in legends mode
|
2023-08-07 12:39:20 -07:00 |
|
Myk Taylor
|
3358a2b516
|
enable more tests
|
2023-08-04 20:40:33 -07: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
|
2370750809
|
add warm/damp highlight overlay for ascii mode
|
2023-07-20 19:17:09 -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 Taylor
|
e1946018f8
|
use TextButton in zone overlay
|
2023-07-16 20:24:46 -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
|
0b9f84a5da
|
don't print error if a building is not selected
|
2023-07-05 19:06:57 -07:00 |
|
Myk Taylor
|
258b647ef6
|
extend the title version widget to show longer version strings
|
2023-06-23 14:36:17 -07:00 |
|
Myk Taylor
|
b571e5b52b
|
don't diplay orders overlay on subscreens
|
2023-06-19 16:48:07 -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
|
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
|
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
|
5ffbb4d0ef
|
unify and update automelt/autotrade/autodump
|
2023-06-11 22:28:01 -07:00 |
|
Myk Taylor
|
dbcba3d548
|
refactor to allow interacting with route stop settings
|
2023-05-28 02:26:06 -07:00 |
|
Myk Taylor
|
d06118ad8e
|
support recording stockpiles in blueprints
|
2023-05-21 09:45:28 -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
|
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 |