Myk
89be6f56ef
Apply suggestions from code review
2023-10-05 12:56:46 -07:00
Najeeb Al-Shabibi
2a842c0df6
merge develop into plugin_preservetombs
2023-10-03 19:32:03 +01:00
Myk
726828af2b
Merge branch 'develop' into reenable-spectatte
2023-10-03 10:50:24 -07:00
Myk Taylor
5d295400d2
centralize management of mouse state
2023-10-01 16:28:18 -07:00
Najeeb Al-Shabibi
0956c06341
update arg changed to 'now' for consistency
2023-10-01 17:33:53 +01:00
Najeeb Al-Shabibi
f7fd769232
Merge branch 'develop' into plugin_preservetombs
2023-10-01 15:13:52 +01:00
Myk Taylor
6e2adaa3a9
don't conflict with macro recording key
2023-09-30 23:31:56 -07:00
Najeeb Al-Shabibi
f77daafdd5
Merge branch 'develop' into plugin_preservetombs
2023-09-30 14:43:53 +01:00
Najeeb Al-Shabibi
7d3764d3ec
removed option to set tickrate for preserve-tombs, fixed at 100 tick interval
2023-09-30 14:42:29 +01:00
Najeeb Al-Shabibi
e2dcced8ef
preserve-tombs command guarded from using update argument when plugin not enabled
2023-09-30 13:21:04 +01:00
Najeeb Al-Shabibi
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
Myk
883ecd1840
Merge pull request #3807 from donhth/make-tubefill-live-again
...
re-enable tubefill.
2023-09-29 10:05:42 -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
Najeeb Al-Shabibi
7933e29119
newline at eof - preservetombs.cpp
2023-09-29 14:45:46 +01:00
Najeeb Al-Shabibi
028fbc34ad
using std::erase_if instead of iterator loop
2023-09-29 14:30:01 +01:00
Najeeb Al-Shabibi
579fe6ee76
fixed sign compare issue linux build
2023-09-29 14:24:42 +01:00
Najeeb Al-Shabibi
0b2989fb15
preservetombs status now shows list of all tracked tomb assignments
2023-09-29 14:08:49 +01:00
Najeeb Al-Shabibi
b0a15b2e8a
added command to show status of preservetombs (is enabled or disabled)
2023-09-29 13:38:52 +01:00
Najeeb Al-Shabibi
e713e63ea3
Merge branch 'develop' into plugin_preservetombs
2023-09-29 13:26:07 +01:00
Najeeb Al-Shabibi
2a145d06b6
fixed crash on tomb unassignment (caused by incorrect params passed to formatted string)
2023-09-29 13:11:13 +01:00
Najeeb Al-Shabibi
986e64aed0
new plugin preserve-tombs ensures that units that die keep their tomb assignments in death
2023-09-29 12:27:09 +01:00
Myk
b3c45941fb
Merge pull request #3824 from myk002/myk_translate
...
protect against bad values in TranslateName
2023-09-28 20:55:27 -07:00
Myk
af65f185a1
Remove unneeded capitalize
2023-09-28 17:43:06 -07:00
Myk Taylor
13f83d2f95
protect against bad values in TranslateName
2023-09-28 16:35:29 -07: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
Kelly Kinkade
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
Najeeb Al-Shabibi
2a5e59134c
Merge branch 'develop' into dig_digtype_nohidden
2023-09-24 20:24:39 +01:00
donhth
ac02483b52
Merge branch 'develop' into make-tubefill-live-again
2023-09-24 07:35:34 -04:00
Najeeb Al-Shabibi
ff03fc1f2d
trailing whitespace removed
2023-09-24 12:17:50 +01:00
Najeeb Al-Shabibi
bf9dbd87a9
Merge branch 'develop' into dig_digtype_nohidden
2023-09-24 12:15:52 +01:00
Najeeb Al-Shabibi
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
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
Kelly Kinkade
9cdfe36aea
reenable `spectate`
...
by request from the community
2023-09-24 04:37:24 -05: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
donhth
303ce1fdc3
re-enable tubefill.
2023-09-23 15:54:46 -04: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 Panov
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
Najeeb Al-Shabibi
6fe0fb5bf9
removed trailing whitespace
2023-09-22 12:45:33 +01:00
Najeeb Al-Shabibi
2083bab2e9
added a +z option to digtype
2023-09-22 12:41:41 +01:00