Commit Graph

3896 Commits (65b8071941f60b4a4dbb83c0e91c028c4da71225)

Author SHA1 Message Date
lethosor a4254a4d2c
xlsxreader: Don't link to zlib directly
It's complicated on Windows, and xlsxio already links to it directly
2020-09-18 15:04:06 -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 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 09b018bea6
stockpiles: remove sand_bags field
Fixes #1013
2020-08-29 20:04:09 -04:00
lethosor 23dc7727b5
Merge remote-tracking branch 'kristjanmoore/develop' into develop 2020-08-29 17:43:46 -04: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 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 45a0b7b3a6
Fix stockpiles crash when building food map
Fixes #1628

Broke due to ecd6bcc9ed
2020-08-18 21:00:10 -04:00
lethosor 19a4d1df5a
Merge remote-tracking branch 'myk002/quickfort_buildingplan' into develop 2020-08-17 23:43:05 -04: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 42108a64b9 expose basic buildingplan functionality to Lua 2020-08-12 15:24:32 -07:00
Myk Taylor 0bda289b17 move xlsxreader identity statics to dfhack lib 2020-08-11 14:51:17 -07:00
Myk Taylor cfc736caa1 give the identity classes distinctive name fields
both would have been represented as "handle" to Lua
2020-08-11 14:18:09 -07:00
Myk Taylor c6f9eb519a remove outdated example code in xlsxreader.cpp
there is already good example code in Lua API.rst and in xlsxreader.lua,
so just remove this one
2020-08-11 13:44:07 -07:00
Myk Taylor 438d264b31 use separate identity classes for each handle type 2020-08-10 23:09:03 -07:00
Myk Taylor 17c509a596 update sample code for xlsxreader to use finalize 2020-08-10 09:18:49 -07:00
Myk Taylor 69322ec429 use proper USERDATA instead of LIGHTUSERDATA 2020-08-10 01:13:16 -07:00
Myk Taylor 679ca41da8 make sure xlsxio knows to link statically 2020-08-09 21:22:17 -07:00
Myk Taylor 06e3f77e39 fix windows zlib path, hopefully for the last time 2020-08-09 10:47:15 -07:00
Myk Taylor e2129673c1 fix zlib path on windows 2020-08-09 10:11:24 -07:00
Myk Taylor 5294360908 more windows library naming shenanigans 2020-08-09 09:46:54 -07:00
Myk Taylor 4a04273fae document xlsxreader functions 2020-08-09 09:28:19 -07:00
Myk Taylor a41f7c0998 convert XlsxReader module to xlsxreader plugin 2020-08-09 08:54:42 -07:00
lethosor 73ba692f15
Fix road building (#1596)
Paved roads need architecture before road building
2020-08-08 14:46:42 -04:00
lethosor b2368b3c34
Merge remote-tracking branch 'ab9rf/labormanager-custom-furnaces' into develop 2020-08-08 14:35:44 -04:00
lethosor a28e939370
Recalculate size after toggling columns (goals can be longer than professions) 2020-08-08 00:45:57 -04:00
lethosor ee8d130298
Use existing pronoun_type enum 2020-08-08 00:12:59 -04:00
Ryan Bennitt 23c22b3b9d Merge branch 'develop' of https://github.com/DFHack/dfhack into feature/manipulator_goal 2020-08-07 22:17:32 +01:00
Ryan Bennitt a85b77e6f1 Retrieve goal string values from enum attributes and add new Units methods to Lua API and docs 2020-08-07 22:07:48 +01:00
lethosor ed9f724117
Use BUILDJOB_NOW key, dim text when no job is selected 2020-08-06 22:44:49 -04:00
lethosor c7e4c724e8
Sort tweaks alphabetically 2020-08-06 22:37:04 -04:00
lethosor 0c53b2b6c5
Add do-job-now tweak
Forum thread: http://www.bay12forums.com/smf/index.php?topic=176700
Original source: https://github.com/dlmarquis/dfhack/blob/dojobnow-r1/plugins/dojobnow.cpp

Co-authored-by: dlmarquis <dlmarquis@users.noreply.github.com>
2020-08-06 22:36:57 -04:00
lethosor 02c0a6c8f6
Update getplants to use new plant_raw.material_defs layout
a9f219baf9 applied to #1564
2020-08-06 00:53:06 -04:00
lethosor d3fc691858
Merge remote-tracking branch 'PatrikLundell/Units' into develop 2020-08-06 00:12:54 -04:00
Ryan Bennitt 9510dd52e1 Add Goal to Manipulator Detail Modes 2020-08-04 23:01:28 +01:00
PatrikLundell 19ad5c92d6 corrected incursion bugs 2020-07-30 10:09:41 +02:00
lethosor 4554ca35f3
Ruby: add _indexenum wrapper to OtherVectors for compat with devel/scanitemsother
Ref #1558
2020-07-26 23:11:04 -04:00
lethosor 655b363238
Fix some spelling errors 2020-07-22 02:23:29 -04:00
lethosor 044add2147
Reorder .proto comments 2020-07-18 12:48:20 -04:00
lethosor 35d659091d
Merge remote-tracking branch 'myk002/blueprint_in_blueprints' into develop 2020-07-17 17:32:59 -04:00
lethosor c858f33f61
reaction-gloves: fix warnings 2020-07-17 00:00:57 -04:00
lethosor 89c24ac8be
Merge remote-tracking branch 'quietust/reaction-gloves' into develop 2020-07-16 22:40:49 -04:00
Myk Taylor bb91fdcf8c Merge remote-tracking branch 'upstream/develop' into blueprint_in_blueprints 2020-07-16 09:24:52 -07:00
lethosor a0d627ebc7
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop 2020-07-16 01:48:07 -04:00
Myk Taylor c19fc1f349 gcc-4.8 compatibility 2020-07-15 21:35:21 -07:00
Myk Taylor e2334387a9 blueprint: write blueprints to blueprints/ subdir
to enable writing to a subdir that may not exist, blueprint now automatically
creates folder trees. E.g. ``blueprint 30 30 1 rooms/dining dig`` will create
the file ``blueprints/rooms/dining-dig.csv``). Previously it would fail if the
``blueprints/rooms/`` directory didn't already exist.
2020-07-15 16:57:14 -07:00
lethosor b6de6f12ec Merge remote-tracking branch 'RosaryMala/remote_reader' into develop 2020-07-13 19:58:33 -04:00