Commit Graph

9821 Commits (b723636fe2e5571eaef2585bd541eee35dc3ccfb)
 

Author SHA1 Message Date
Myk Taylor f09b0fa699 quickfort: define useful aliases for hauling 2020-08-26 22:38:49 -07:00
Myk Taylor 60c74c4693 Merge remote-tracking branch 'upstream/develop' into quickfort_docs 2020-08-26 21:25:05 -07:00
lethosor 3b5a82cc05
Change color of ListBox.select2_hint to grey to indicate enabled
Ref dfhack/scripts#185
2020-08-27 00:08:28 -04:00
Myk Taylor 5d43ba2178 quickfort: document marker mode and buildingplan
also a bit of cleanup and reorg
2020-08-26 19:59:30 -07:00
George Murray a84a1f0ee9 Switch trade screen search to use search_multicolumn_modifiable so that item counts are updated correctly with other information 2020-08-25 14:15:41 -07:00
kristjanmoore 0fa4987edb Update authors 2020-08-23 18:01:16 +00:00
kristjanmoore cb8a903240 Update changelog 2020-08-23 17:38:27 +00:00
kristjanmoore 293b0253c4 Set min_waterfall special cases outside loop 2020-08-23 17:35:45 +00:00
kristjanmoore 3ebb812cd5 Allow searches for higher waterfalls 2020-08-23 13:20:45 +00:00
lethosor 94798a3620
Pass CMAKE_GENERATOR_TOOLSET to ExternalProject_Add instead 2020-08-22 10:38:29 -04:00
lethosor 5a77c9037e
Pass CMAKE_GENERATOR_TOOLSET (cmake -T argument) to external projects
The dependencies introduced in #1620 cause an error when building natively on Windows, according to @ragundo. CMake is looking for build tools `v100`, which are part of VS2010 and won't work with DF/DFHack, even if they were installed.

Some of the Windows build scripts pass in `-T v140_xp` (from VS2015), so passing this option through to subprojects may help: https://cmake.org/cmake/help/latest/variable/CMAKE_GENERATOR_TOOLSET.html
2020-08-21 19:49:33 -04:00
lethosor c034276af5
Merge remote-tracking branch 'myk002/quickfort_filter' into develop 2020-08-21 00:34:34 -04:00
lethosor 8779ca0659
Merge remote-tracking branch 'myk002/quickfort_civzones' into develop 2020-08-21 00:34:26 -04:00
lethosor fc77fca3b7
Update scripts 2020-08-20 00:33:39 -04:00
lethosor 058f550d72
Merge remote-tracking branch 'myk002/quickfort_library' into develop 2020-08-20 00:32:07 -04:00
lethosor ba322b7d74
Merge remote-tracking branch 'myk002/quickfort_no_materials' into develop 2020-08-20 00:29:01 -04:00
lethosor 7d3165a2fb
Merge remote-tracking branch 'myk002/quickfort_row_height' into develop 2020-08-20 00:28:30 -04:00
Myk Taylor be9cf43186 Merge remote-tracking branch 'upstream/develop' into quickfort_filter 2020-08-19 19:47:32 -07:00
lethosor 7bac4c89c4
Update API docs for setJobCooldown and removeWorker, use "cooldown" for consistency with C++
Ref http://www.bay12forums.com/smf/index.php?topic=164123.msg8180385#msg8180385
2020-08-19 17:12:40 -04:00
lethosor 45a0b7b3a6
Fix stockpiles crash when building food map
Fixes #1628

Broke due to ecd6bcc9ed
2020-08-18 21:00:10 -04:00
Myk Taylor abc5be1cb5 Merge remote-tracking branch 'upstream/develop' into quickfort_library 2020-08-17 21:16:58 -07:00
Myk Taylor 9a3e9d5b12 listbox filter can match strings after punctuation 2020-08-17 21:15:33 -07:00
Myk Taylor 8a438c2a55 allow row_height to be set from the ListBox class 2020-08-17 21:14:05 -07:00
lethosor 19a4d1df5a
Merge remote-tracking branch 'myk002/quickfort_buildingplan' into develop 2020-08-17 23:43:05 -04:00
lethosor 6755233887
Merge remote-tracking branch 'myk002/quickfort_xlsxio' into develop 2020-08-17 23:00:03 -04:00
Myk Taylor c1c3b02e89 make capitalization the same as other blueprints 2020-08-16 20:54:21 -07:00
Myk Taylor a1c731870d initial files for the quickfort blueprint library 2020-08-16 13:49:32 -07:00
Myk Taylor 860f07e994 define quickfort aliases to permit cages and traps 2020-08-16 12:42:16 -07:00
Myk Taylor 4ac51535a0 userguide updates 2020-08-16 11:55:42 -07:00
Myk Taylor 36c643b909 Merge remote-tracking branch 'upstream/develop' into quickfort_no_materials 2020-08-16 11:55:17 -07:00
Myk Taylor 7a7aff7745 closing NULL pointers is ok 2020-08-15 23:37:21 -07:00
Myk Taylor e4a35514ab document buildingplan Lua API 2020-08-15 23:03:49 -07:00
Myk Taylor 4e331ce4ce much better NULL handling/detection for xlsxreader 2020-08-15 22:35:20 -07:00
Myk Taylor 1e068ef247 output useful error if new deps are not found 2020-08-15 22:34:43 -07:00
Myk Taylor f22d1ed4a0 Merge remote-tracking branch 'upstream/develop' into quickfort_xlsxio 2020-08-15 22:34:24 -07:00
lethosor 911e952aca
Merge remote-tracking branch 'myk002/quickfort_userguide' into develop 2020-08-15 23:38:16 -04:00
Myk Taylor e546d3eec3 rename is_civzone to the more general allow_wall 2020-08-15 20:13:48 -07:00
Myk Taylor dd3ff7252d document additional parameter to checkFreeTiles 2020-08-15 17:26:38 -07:00
Myk Taylor ae872e812f properly detect valid tiles for civzones 2020-08-15 17:24:12 -07:00
Myk Taylor 03b28f4e08 document inactive zones and extra lever mechanisms 2020-08-15 17:23:12 -07:00
Myk Taylor 9e31603157 document multi-init for stockpiles and zones 2020-08-15 07:55:16 -07:00
Myk Taylor 861c34a474 document the message() marker 2020-08-14 21:27:16 -07:00
Myk Taylor a8f215fcfe remove '+' as a special key. it's too useful.
plus, the original quickfort doesn't seem to have generally treated it
as {Shift}. it was special-cased when it preceded {Enter}, which we
don't need to do.
2020-08-14 21:14:50 -07:00
Myk Taylor eeed2381d0 mention zones as one of the major phases 2020-08-14 21:14:15 -07:00
Myk Taylor 3e114bb944 document manager order generation 2020-08-14 19:45:35 -07:00
Myk Taylor ab63288097 document zone mode; document current limitations 2020-08-13 22:53:31 -07:00
Myk Taylor 2dc1f1ad3b document the hidden() modeline marker 2020-08-13 21:11:02 -07:00
Myk Taylor 7fd7bd2fab document meta blueprints and reorg sections 2020-08-13 11:52:34 -07:00
Myk Taylor 26ce6fe199 document labels and multi-blueprint file formats 2020-08-13 00:51:34 -07:00
Myk Taylor 42108a64b9 expose basic buildingplan functionality to Lua 2020-08-12 15:24:32 -07:00