Commit Graph

10295 Commits (ceae4723cd3abd84b4c3961abec5a48a6877d49d)
 

Author SHA1 Message Date
lethosor 7efadc85a6
Remove some unused config 2020-09-18 00:36:50 -04:00
lethosor b85759620f
Switch libzip and xlsxio to be included with add_subdirectory(), disable xlsxio installation 2020-09-18 00:33:41 -04:00
lethosor f354f7800f
Switch to DFHack forks of lipzip and xlsxio, and update
libzip: upgraded to 1.7.3 (was between 1.7.1 and 1.7.2)
xlsxio: downgraded to latest release (0.2.29), which should be inconsequential: https://github.com/brechtsanders/xlsxio/compare/0.2.29...2d12a88
2020-09-17 21:00:16 -04:00
lethosor b47710ae6f
Upgrade libexpat
Needed for a consistent target name: da7cda3a85
This commit is likely close to 2.2.10 anyway
2020-09-17 20:09:13 -04:00
lethosor 42d4d33571
Only modify xlsxreader target if it was created
Ref #1620
2020-09-17 15:41:29 -04:00
lethosor 1efa09582a
Change libexpat to be included with add_subdirectory()
- Confirmed that libexpat is built statically and linked with xlsxreader
- May need da7cda3a85 for Windows
- Although libexpat's CMake options are all prefixed with LIBEXPAT_, it also adds some cache entries like SIZE_T (from expat/ConfigureChecks.cmake). Unsure if these affect other libs.
- xlsxio may need additional reconfiguration after moving to add_subdirectory() to find libexpat/libzip on non-Linux platforms.
2020-09-17 00:25:50 -04:00
lethosor 6e9c2093d7
Merge remote-tracking branches 'myk002/quickfort_docs' and 'myk002/quickfort_room_alias_doc' into develop 2020-09-13 23:59:31 -04:00
Myk Taylor f837532b42 use more precise item vectors for bld item filters 2020-09-13 17:12:29 -07:00
Myk Taylor 8660355838 formally declare used globals in fortplan 2020-09-08 21:30:12 -07:00
Myk Taylor 3b362294b9 move quickfort logic from Planner to buildingplan
where all the other gui-related logic is.
2020-09-08 17:34:11 -07:00
Myk Taylor f3da131db7 reorganize buildingplan code - no logic changes
- no API or logic changes, just moving code around
- split buildingplan-lib into planner and rooms files
- move business logic from .h files to .cpp files
2020-09-08 00:17:56 -07:00
Myk Taylor da020c72de quickfort: refresh aliases docs and doc r+ -> r+& 2020-09-02 16:53:32 -07:00
Myk Taylor e0fec78481 final cleanup pass; add docs for dig priorities 2020-09-01 19:48:10 -07:00
lethosor 8728056674
Update scripts 2020-09-01 00:17:32 -04:00
lethosor 09b018bea6
stockpiles: remove sand_bags field
Fixes #1013
2020-08-29 20:04:09 -04:00
lethosor 5aca88ef03
Update submodules 2020-08-29 20:02:33 -04:00
lethosor 23dc7727b5
Merge remote-tracking branch 'kristjanmoore/develop' into develop 2020-08-29 17:43:46 -04:00
lethosor 21f3c4ef28
Merge remote-tracking branch 'lethosor/cmake-external-toolset' into develop 2020-08-29 17:32:00 -04:00
lethosor d266a13a8e
Merge remote-tracking branches 'myk002/quickfort_hauling_aliases' and 'myk002/quickfort_library' into develop 2020-08-29 17:30:01 -04:00
lethosor d571f90f88
Update scripts 2020-08-29 17:29:33 -04:00
lethosor 100ba998a1
Update changelog, authors (#1633) 2020-08-28 18:44:16 -04:00
lethosor ba2e974609
Merge remote-tracking branch 'GitOnUp/1602-restore-item-counts' into develop
Fixes #1602
2020-08-28 18:41:57 -04:00
Myk Taylor 595e07d451 light proofreading pass of quickfort user guide 2020-08-27 13:36:47 -07:00
Myk Taylor 9598d02593 update quickfort blueprint library
- update dreamfort to use the new hauling route naming aliases
- add strategic whitespace to csv files to make them easier to read
- group related library files into subdirectories
- better filenames for exploratory-mining files
- add set of marker-mode layout helpers (inspired by Salford Sal's DF
  tutorial videos
  https://www.youtube.com/channel/UCVLgfAP_1VOlVLUJMJ7ahhA)
2020-08-27 13:20:27 -07:00
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