Commit Graph

615 Commits (a50013af26680351e283dde2a2f6d18d23bc5515)

Author SHA1 Message Date
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