845993ba59
Merge remote-tracking branch 'lethosor/fix-k-search-crash' into develop
2021-01-29 20:08:08 -05:00
c5ab6e6ed4
Update scripts
...
dfhack/scripts#246
2021-01-29 01:00:37 -05:00
5c14f619c8
Merge remote-tracking branch 'myk002/myk_buildingplan_enable_all' into develop
2021-01-29 00:59:33 -05:00
7f62c12a83
document all_enabled setting
2021-01-28 21:50:43 -08:00
4fbd763c1a
Also cancel 'k' search when hotkeys (F1 - Shift-F8) are pressed
2021-01-29 00:28:32 -05:00
865484f678
Merge branch 'develop' into fix-k-search-crash
...
Conflicts:
docs/changelog.txt
2021-01-29 00:16:13 -05:00
810d2858bb
Update scripts
...
dfhack/scripts#238
2021-01-29 00:04:24 -05:00
de6f9183fd
Fix changelog, replace a couple qerror calls with error
...
Ref #1746
2021-01-29 00:04:10 -05:00
d4aef78b26
Merge remote-tracking branch 'myk002/myk_getopt' into develop
2021-01-28 23:58:45 -05:00
e4041495c4
Merge remote-tracking branch 'bseiller/ea_incursion_struct' into develop
2021-01-28 23:19:11 -05:00
a2ee5e027b
Merge remote-tracking branch 'myk002/myk_help_i_am_my_own_grandpa' into develop
2021-01-26 23:53:39 -05:00
1f7cae17ef
Merge branch 'develop' into ea_incursion_struct
2021-01-26 23:22:59 +01:00
2d5eb9c29d
Merge remote-tracking branch 'bseiller/prevent_repeated_survey_mlt_calls' into develop
2021-01-26 00:50:58 -05:00
07c9cab969
Add comma
2021-01-26 00:45:30 -05:00
58244ee574
Merge remote-tracking branch 'myk002/myk_dreamfort' into develop
2021-01-26 00:45:05 -05:00
10634b8ae5
fix merge error
2021-01-24 09:19:01 -08:00
96dfea70c3
update changelog
2021-01-24 09:12:49 -08:00
d0fc448a39
add 'enable all' option for buildingplan
...
This kind of functionality is much more important now than it used to
be since there are so many supported building types.
Also modified the 'Planning Mode' status on the building placement
screen to reflect whether we're in quickfort mode, enable all mode, or
whether just the building type is enabled.
this setting is not persisted (just like quickfort_mode is not
persisted), but it can be set from onMapLoad.init
2021-01-24 09:08:36 -08:00
32a0363f31
move identity check up a bit to avoid useless work
2021-01-24 08:57:56 -08:00
03719f58df
avoid infinite parentage when linking rooms
2021-01-24 08:52:34 -08:00
3c4cb749a3
Merge branch 'develop' of https://github.com/DFHack/dfhack into prevent_repeated_survey_mlt_calls
2021-01-24 13:57:27 +01:00
c525b80dda
Merge branch 'develop' of https://github.com/DFHack/dfhack into ea_incursion_struct
2021-01-24 13:54:25 +01:00
d01e61c658
Fix some error message formatting and add some cross-links to docs
...
Followup to #1747
2021-01-22 21:05:20 -05:00
5ef7a81fd1
Merge remote-tracking branch 'myk002/myk_buildingplan_set_settings' into develop
2021-01-22 20:57:30 -05:00
ad39bb3c33
address review comments
2021-01-22 12:48:36 -08:00
ed3c48e64b
Update changelog and authors ( #1755 )
2021-01-21 23:55:01 -05:00
0e269906d0
Merge remote-tracking branch 'bseiller/remove_survey_map' into develop
2021-01-21 23:53:07 -05:00
4a7546c03a
Update scripts
2021-01-21 00:16:44 -05:00
0089edde1e
Merge remote-tracking branch 'myk002/myk_docs_ignore' into develop
2021-01-21 00:14:15 -05:00
6a1b70ae76
making lint happy by removing trailing whitespace
2021-01-19 17:43:32 +01:00
438811e108
handling special case of the cursor having been positioned in the lower right corner before the search
...
- matcher.cpp: manually moving the cursor to the neighbouring world tile so it can be moved back and embark_update is being called when all (incursion) data has been collected
Co-Authored-By: PatrikLundell <22739822+PatrikLundell@users.noreply.github.com>
2021-01-19 16:37:59 +01:00
9b9373be4f
removing commented out assigments
2021-01-19 12:06:36 +01:00
cb496c3f59
fixing indention/whitespaces
...
- defs.h: replacing tab with space/blank for indents
2021-01-19 00:07:28 +01:00
e99c8faa24
switching to mid_level_tile_incursion_base to store incursion data of world tile edges
...
- defs.h: using mid_level_tile_incursion_base in region_tile_datum to store incursion data of world tile edges
- survey.cpp: commented out "not used" blocks of assignment in survey_mid_level_tile that no longer make sense now
2021-01-19 00:01:54 +01:00
bdfd50cc65
using mid_level_tile_incursion_base instead of mid_level_tile for incursion processing
...
- matcher.cpp, survey.cpp: adapting signatures to use new struct that only contains incursion specific attributes
2021-01-18 23:50:14 +01:00
cc68767336
created struct mid_level_tile_incursion_base that only contains attributes that are relevant for incursion processing
...
- def.h: make attributes/fields of mid_level_tile_incursion_base available in mid_level_tile by inheriting from mid_level_tile_incursion_base which also allows treating mid_level_tile as a mid_level_tile_incursion_base
2021-01-18 23:23:50 +01:00
85fe05b723
early return from embark_update during an active search to improve performance
...
- embark-assistant.cpp: checking if a search is active, if so return early
2021-01-18 22:08:46 +01:00
c300cae2f9
removing 2 dead stores to speed up survey::survey_mid_level_tile
...
- survey.cpp: removing layer_bottom and layer_top, which are never read, but slow down survey_mid_level_tile significantly because entries are added quite often into the tree map structure
- survey.h: removing now obsolete include for map
2021-01-18 19:38:57 +01:00
e7b770b65a
Update scripts
2021-01-16 00:20:49 -05:00
00cc32f059
Merge remote-tracking branch 'myk002/myk_empty_alias' into develop
2021-01-16 00:10:55 -05:00
cfdc28dfa6
Update scripts
2021-01-14 00:13:06 -05:00
39d274b00e
address review comments
2021-01-12 23:42:53 -08:00
4300c185d7
Update docs/changelog.txt
...
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2021-01-12 22:46:18 -08:00
b5b7319a23
add documentation for #ignore blueprints
2021-01-11 15:58:16 -08:00
39059f2b12
update changelog
2021-01-11 15:14:24 -08:00
d43ccf118a
give names to stockpiles levers bridges and zones
...
and ensure diggers don't dig deeper than they need to using dig
priorities
2021-01-11 15:11:16 -08:00
fc270677fd
add checklist for all required dreamfort commands
2021-01-11 15:11:16 -08:00
b49768a7cf
use and document new {Empty} quickfort keycode
2021-01-11 15:04:41 -08:00
96b117d369
update plugin docs and changelog
2021-01-11 14:37:57 -08:00
339d5ce26b
set buildingplan global settings from prompt
...
allow buildingplan settings to be set from the DFHack# prompt. For
example, if a player knows they'll always want to build with blocks,
they could add the following two lines to onMapLoad.init:
buildingplan set boulders false
buildingplan set logs false
2021-01-10 17:29:53 -08:00
lethosor
myk002
bseiller
Myk Taylor