6e2adaa3a9
don't conflict with macro recording key
2023-09-30 23:31:56 -07:00
883ecd1840
Merge pull request #3807 from donhth/make-tubefill-live-again
...
re-enable tubefill.
2023-09-29 10:05:42 -07:00
424f242823
Merge branch 'develop' into work_orders_manager_enhancement
2023-09-29 09:43:19 -07:00
7b87219657
Update plugins/lua/orders.lua
2023-09-29 09:40:52 -07:00
51173fb9fe
Removed material and job type sortings.
2023-09-29 17:34:48 +03:00
b3c45941fb
Merge pull request #3824 from myk002/myk_translate
...
protect against bad values in TranslateName
2023-09-28 20:55:27 -07:00
af65f185a1
Remove unneeded capitalize
2023-09-28 17:43:06 -07:00
13f83d2f95
protect against bad values in TranslateName
2023-09-28 16:35:29 -07:00
bff1b5e7b0
make the ascii DFHack logo easier to read
2023-09-28 14:41:30 -07:00
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
da77be29be
Merge pull request #3816 from myk002/myk_remousify
...
align mouse button semantics to DF
2023-09-26 19:09:23 -07:00
1e4e6ed03f
Merge remote-tracking branch 'main_repository/develop' into combat_skill_rating_polishing
2023-09-26 17:42:27 +03:00
eefd38c66c
align mouse button semantics to DF
...
we, um, had it backwards
2023-09-26 03:52:24 -07:00
0559af9f13
autolabor: fix #3812
...
make sure autolabor resets the work detail bypass flag whenever autolabor is unloaded for _any_ reason
i tested `disable autolabor`, `unload autolabor`, and unloading a fort with autolabor enabled; in all cases the work detail bypass flag was cleared as desired
closes #3812
2023-09-24 19:10:46 -05:00
2a5e59134c
Merge branch 'develop' into dig_digtype_nohidden
2023-09-24 20:24:39 +01:00
ac02483b52
Merge branch 'develop' into make-tubefill-live-again
2023-09-24 07:35:34 -04:00
ff03fc1f2d
trailing whitespace removed
2023-09-24 12:17:50 +01:00
bf9dbd87a9
Merge branch 'develop' into dig_digtype_nohidden
2023-09-24 12:15:52 +01:00
b22ca57f50
added previous 'hidden' and 'no-auto' functionality as options, and adjusted how z-level options are specified
2023-09-24 12:15:46 +01:00
be26449ef7
ugh
2023-09-24 13:22:20 +03:00
bb5e178756
fix eof
2023-09-24 13:19:48 +03:00
9f4f14d025
put back unformatted hotkeys
2023-09-24 13:18:58 +03:00
f4348095a3
upstream
2023-09-24 11:45:07 +03:00
6f26650255
reserved texpos range
2023-09-24 11:44:03 +03:00
303ce1fdc3
re-enable tubefill.
2023-09-23 15:54:46 -04:00
a236722a75
Changed hotkeys + orders.cpp compilation error fix.
2023-09-22 18:37:14 +03:00
9c866d5134
Merge remote-tracking branch 'main_repository/develop' into work_orders_manager_enhancement
2023-09-22 18:30:21 +03:00
a500233e0b
Moved onde order recheck to orders plugin.
2023-09-22 18:29:45 +03:00
3fc289cefa
Added single order recheck option to orders recheck. Sorting by material and job type consider frequency as a higher priority.
2023-09-22 16:26:23 +03:00
6fe0fb5bf9
removed trailing whitespace
2023-09-22 12:45:33 +01:00
2083bab2e9
added a +z option to digtype
2023-09-22 12:41:41 +01:00
b7fcf035bc
Stopped setting auto-dig on non-default dig designations as auto-dig doesn't work for anything except for the standard 'mine' designation
2023-09-22 12:18:38 +01:00
6f45e347af
digtype now doesn't designate hidden tiles for digging, instead only designating visible tiles in 'auto' mode (also changed MapCache* to unique_ptr<MapCache>)
2023-09-22 12:14:41 +01:00
3d6d148ad7
using namespace std removed and replaced with std:: prefix, to resolve naming conflict of lerp with std::lerp in C++20
2023-09-21 02:40:03 +01:00
8826c27fa0
Changed 'reset' to recheck for clarity.
2023-09-18 13:41:02 +03:00
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
7d3786586a
Reverted sort.lua. Changed orders sort by material keybing from T to M.
2023-09-18 12:28:34 +03:00
48c48baab4
allow semi-wild units to be butchered
2023-09-17 21:23:45 -07:00
ebb190e356
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-09-16 11:37:12 +00:00
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
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
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
04999cae8d
unbreak Ctrl-Shift-C
2023-09-14 10:43:35 -07:00
3634075df0
make DFHack logo glow on hover
2023-09-14 10:12:25 -07:00
b6c4eb7701
realign tooltip ids in confirm
2023-09-14 09:59:51 -07:00
b11a3ead1e
make DFHack logo respond to clicks, not mouseover
2023-09-14 01:31:19 -07:00
d9cae63e4e
move dfhack logo over a little
2023-09-13 18:02:44 -07:00
a43522351f
check-structures-sanity: ignore std::unordered_map
2023-09-12 23:42:50 -04:00
70b48dfa6f
let vanilla blinking take over when possible
2023-09-10 21:14:59 -07:00
73b5f0ced1
continue to highlight designations once they have become jobs
2023-09-10 20:20:04 -07:00
Myk Taylor
Myk
Mikhail Panov
Kelly Kinkade
Najeeb Al-Shabibi
donhth
shevernitskiy
Mikhail
pre-commit-ci[bot]
lethosor