Commit Graph

12689 Commits (3459d61dc4c83c7b3f0ebfab21dccf1063e3063e)
 

Author SHA1 Message Date
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
Myk Taylor 0f9f64d137 remove materials files and replace with settings 2020-08-12 15:14:59 -07:00
Myk Taylor bda678bcd4 add some explanatory text to the top of the header 2020-08-11 19:47:04 -07:00
Myk Taylor 39ae2d95fc 2nd attempt to solve compilation errors on windows 2020-08-11 17:06:28 -07:00
Myk Taylor 4f88bb4c3d attempt to solve compilation error on windows 2020-08-11 16:54:53 -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 1e9562bd76 add target label for xlsxreader 2020-08-10 23:35:38 -07:00
Myk Taylor 438d264b31 use separate identity classes for each handle type 2020-08-10 23:09:03 -07:00
Myk Taylor 0d9614154f don't turn a rst list into code 2020-08-10 23:04:05 -07:00
Myk Taylor a2279cc9a7 update docs in Lua API.rst too 2020-08-10 14:37:59 -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 702228bf12 use standard CMAKE vars for prefixes and suffixes 2020-08-10 01:01:13 -07:00
Myk Taylor 6da364a60b ensure libexpat is used as a static lib 2020-08-10 00:01:47 -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 a6c0d8f196 Merge remote-tracking branch 'upstream/develop' into quickfort_userguide 2020-08-09 08:56:30 -07:00
Myk Taylor a41f7c0998 convert XlsxReader module to xlsxreader plugin 2020-08-09 08:54:42 -07:00
Myk Taylor 5fc627a16f no lib prefix for libzip on windows too 2020-08-09 04:03:04 -07:00
Myk Taylor 7a0853025a use non-standard xlsxio lib name on windows 2020-08-09 03:30:59 -07:00
Myk Taylor 8913d43d6f ensure xlsxio_project gets built before dfhack 2020-08-09 02:59:22 -07:00
Myk Taylor f04a9c3180 clean up logging; use xlsxio's misspelling of "DIRS" 2020-08-09 02:32:31 -07:00
Myk Taylor 79415cf097 clean up dep lib vars 2020-08-09 02:24:05 -07:00
Myk Taylor 204240f3e3 specify expat include dir for xlsxio 2020-08-09 02:14:37 -07:00
Myk Taylor c7cf7fdd30 define EXPAT_LIBRARIES for xlsxio 2020-08-09 02:00:06 -07:00
Myk Taylor 43bcec4a57 move libzip to older version
although they declare that they only need cmake 3.0.2, they started
using add_compile_definitions(), which was added in cmake 3.12

git checkout 29b881d fixes this
2020-08-09 00:46:50 -07:00
Myk Taylor bb988d25e6 try to get the library suffix right for windows 2020-08-09 00:24:25 -07:00
Myk Taylor 51794d91ed really get the env vars 2020-08-08 23:55:24 -07:00