89be6f56ef
Apply suggestions from code review
2023-10-05 12:56:46 -07:00
082a97a0f6
remove refrence to unused field
...
`wait_timer` is not really there; what we have labeled as `wait_timer` is actually padding so there is no need to do this
2023-10-04 01:13:55 -05:00
2a842c0df6
merge develop into plugin_preservetombs
2023-10-03 19:32:03 +01:00
726828af2b
Merge branch 'develop' into reenable-spectatte
2023-10-03 10:50:24 -07:00
5d295400d2
centralize management of mouse state
2023-10-01 16:28:18 -07:00
0956c06341
update arg changed to 'now' for consistency
2023-10-01 17:33:53 +01:00
f7fd769232
Merge branch 'develop' into plugin_preservetombs
2023-10-01 15:13:52 +01:00
6e2adaa3a9
don't conflict with macro recording key
2023-09-30 23:31:56 -07:00
f77daafdd5
Merge branch 'develop' into plugin_preservetombs
2023-09-30 14:43:53 +01:00
7d3764d3ec
removed option to set tickrate for preserve-tombs, fixed at 100 tick interval
2023-09-30 14:42:29 +01:00
e2dcced8ef
preserve-tombs command guarded from using update argument when plugin not enabled
2023-09-30 13:21:04 +01:00
6be9de5e51
preserve-tombs added option to change tick rate, changed default update frequency, changed some print to debug statements, some other adjustments
2023-09-30 12:30:40 +01: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
7933e29119
newline at eof - preservetombs.cpp
2023-09-29 14:45:46 +01:00
028fbc34ad
using std::erase_if instead of iterator loop
2023-09-29 14:30:01 +01:00
579fe6ee76
fixed sign compare issue linux build
2023-09-29 14:24:42 +01:00
0b2989fb15
preservetombs status now shows list of all tracked tomb assignments
2023-09-29 14:08:49 +01:00
b0a15b2e8a
added command to show status of preservetombs (is enabled or disabled)
2023-09-29 13:38:52 +01:00
e713e63ea3
Merge branch 'develop' into plugin_preservetombs
2023-09-29 13:26:07 +01:00
2a145d06b6
fixed crash on tomb unassignment (caused by incorrect params passed to formatted string)
2023-09-29 13:11:13 +01:00
986e64aed0
new plugin preserve-tombs ensures that units that die keep their tomb assignments in death
2023-09-29 12:27:09 +01: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
9cdfe36aea
reenable `spectate`
...
by request from the community
2023-09-24 04:37:24 -05: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
9951e5f505
cast chars to chars
2023-09-10 12:54:06 -07:00
898e98bea7
don't display priority if there is no priority block
2023-09-10 12:33:22 -07:00
a02d14bb5f
alternate drawing designation and priority
2023-09-10 12:29:31 -07:00
24b27c79b6
draw directional tracks
2023-09-10 12:11:06 -07:00
a0919ec316
add ASCII-mode highlight for smoothing and carving designations
2023-09-10 05:29:55 -07:00
ee61c76bc0
use find method instead of binsearch
2023-09-09 10:42:20 -07:00
e4edc9be4e
fix crash on invalid saved seed id
2023-09-09 07:49:35 -07:00
45e5168a91
ensure face textures get reloaded on map load
2023-09-09 07:20:59 -07:00
9d233e6e34
unify stress face pens and rewrite arrival sort docs
2023-09-09 07:00:17 -07:00
b8ad8379ef
Merge pull request #3747 from myk002/myk_sort_squad_v2
...
[sort] squad screen v2
2023-09-08 21:12:18 -07:00
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
a061a418a1
allow reset to defaults by changing version attribute
2023-09-08 20:25:20 -07:00
8f1889edf2
increment overlay widget version so pos is reset
2023-09-08 20:22:44 -07:00
1e9e38a0de
implement ratings for arrival order
2023-09-08 20:06:51 -07:00
603f1b16c2
use stress face icons for stress and training need
2023-09-08 18:48:05 -07:00
5f32042f1a
adjust colorization of ratings
...
move mental stability from a sort to a filter
2023-09-08 16:44:59 -07:00
0d366740e7
move the dimensions readout out from under the heat safety filter
2023-09-07 18:29:29 -07:00
d0f08dcc0d
implement rating overlay
2023-09-07 16:14:20 -07:00
f0b0c2093b
flatten sort functions
2023-09-07 11:30:08 -07:00
229e7aef87
enable filtering by race
2023-09-05 17:50:17 -07:00
ff3d4c5b38
support creating items inside of bags
2023-09-05 00:31:35 -07:00
29ccdcf4b9
Remove leftover debug print
2023-09-04 20:45:53 -07:00
1d6ae37a66
fix and reinstate heat safety filter
2023-09-03 11:54:32 -07:00
a2b50a88a5
reorder branches for better readability
2023-09-03 07:12:41 -07:00
3f1eac720f
respect empty and lye_milk_free flags
2023-09-03 07:08:57 -07:00
6096165eee
fix handling of ticks parameter
2023-09-02 02:03:03 -07:00
426099f82b
label updates for squad sort options
2023-09-01 14:35:55 -07:00
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
ffc884d69d
fix migrant wave ordering
...
use active index instead of unit id
2023-08-31 19:42:02 -07:00
52543f9fc0
clean out unused code/vars
2023-08-31 19:14:47 -07:00
Myk
Kelly Kinkade
Najeeb Al-Shabibi
Myk Taylor
Mikhail Panov
donhth
shevernitskiy
Mikhail
pre-commit-ci[bot]
lethosor