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
b33f06efee
refactoring embark-assistant survey, 3.iteration
...
- survey.cpp: replacing repeated nested vector access with a mid_level_tile reference in survey_mid_level_tile
2021-01-28 23:48:09 +01:00
e90e84ab87
refactoring embark-assistant survey, 2.iteration
...
- survey.cpp: replacing pointer and repeated nested vector access with a region_tile_datum reference in survey_mid_level_tile
2021-01-28 23:40:58 +01:00
6e012bb032
refactoring embark-assistant survey, 1.iteration
...
- survey.cpp: replacing repeated double vector access with a reference in survey_mid_level_tile
2021-01-28 23:38:40 +01:00
8a728c5170
fix tallow alias
2021-01-28 12:17:26 -08:00
98f3142c92
change deactivation message to be more accurate
...
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2021-01-28 18:00:34 +00:00
aeb911878b
document new aliases
2021-01-27 14:57:03 -08:00
bd75c4293f
add forbidcrafts alias
2021-01-27 13:23:17 -08:00
42ae0727fe
resolve hotkey help text conflict
...
between stockflow and stockpiles
I removed stockpiles's dynamic placement code as well. it attempted to
move the hotkey help text down if it covered any stockpile links, but
this will no longer work since other hotkey text already takes up all
the lines below stockpiles' hotkey text.
2021-01-27 08:37:12 -08:00
ff69665815
keep stockflow from stealing input during rename
2021-01-27 08:25:21 -08:00
b7c598bb07
update changelog
2021-01-27 08:21:34 -08:00
a0151cc157
add 'crafts' alias
2021-01-27 08:20:00 -08: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
a32a905708
fix typo
2021-01-25 14:53:10 -08:00
3372099f96
add aliases for bronze armor too
2021-01-24 17:11:17 -08:00
99fa1916f8
update changelog
2021-01-24 17:03:13 -08:00
cf8f9386f4
add alias for bronze weapons
2021-01-24 17:02:26 -08: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
cd476a943c
fix quickfort library aliases for weapons
2021-01-24 09:00:38 -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
b57286c59c
update changelog
2021-01-17 17:32:31 +00:00
lethosor
bseiller
myk002
Su
Myk Taylor
Susan