Commit Graph

9743 Commits (615bb81da60c3e897566786bb26efb3ced470362)
 

Author SHA1 Message Date
lethosor 615bb81da6
Add two GCC versions to build matrix 2020-10-07 00:37:35 -04:00
lethosor d850389cde
Adjust sphinx flags 2020-10-07 00:31:32 -04:00
lethosor 73d2a4c9e3
Move docs build to separate job 2020-10-07 00:28:51 -04:00
lethosor 9ba677a38b
Update xml
dfhack/df-structures#410
2020-10-06 22:03:13 -04:00
lethosor 2b00a45833
Merge branch 'quickfort-docs-rst' into develop 2020-10-06 22:02:26 -04:00
lethosor d254ff2401
Tweak links to quickfort command docs 2020-10-06 22:02:14 -04:00
lethosor 56d4b72414
Replace blueprints/readme with pointer to docs 2020-10-03 23:57:36 -04:00
lethosor 2ff4197afe
Add anchor 2020-10-03 23:56:57 -04:00
lethosor 5f47491e78
Use custom link roles when possible 2020-10-02 00:22:35 -04:00
lethosor 8dfdf75e7c
Add roles for links to source code on GitHub 2020-10-02 00:22:11 -04:00
lethosor 90994f2abd
Standardize title 2020-10-01 22:19:33 -04:00
lethosor 00cd52dca7
Add user guides section to main toctree 2020-10-01 22:17:53 -04:00
lethosor 4746e5c046
Change/remove headings to match original TOC nesting 2020-10-01 22:10:11 -04:00
lethosor 77c37ebb73
Switch to native RST table of contents 2020-10-01 22:08:58 -04:00
lethosor 53b78d5266
Convert external docs links to internal links 2020-10-01 21:59:48 -04:00
lethosor 5d98193c54
Convert quickfort user guide to RST using pandoc
Unchanged. First pass of dfhack#1653
2020-10-01 21:50:28 -04:00
lethosor 4e7ca99db1
Update scripts 2020-10-01 21:31:59 -04:00
lethosor 93d43ba9e3
Update changelog (#1620, #1660) 2020-09-29 20:08:35 -04:00
lethosor 17bc4cd365
Merge remote-tracking branch 'myk002/buildingplan_item_match' into develop 2020-09-29 20:04:02 -04:00
lethosor b144973640
Merge remote-tracking branch 'myk002/buildings_vectors' into develop 2020-09-29 18:51:14 -04:00
Myk Taylor c73b1f03af buckets can be lye- and milk-free
otherwise the bucket for wells can never be matched
2020-09-29 00:23:44 -07:00
Myk Taylor 3c51bb51ab remove references to non-existent vector ids 2020-09-28 23:14:13 -07:00
Myk Taylor 6cc1428199 Merge remote-tracking branch 'upstream/develop' into buildings_vectors 2020-09-28 23:13:13 -07:00
lethosor 3c037ef52a
Clean up plugin mkmodule/require explanation 2020-09-24 00:16:32 -04:00
lethosor 945cd2e43e
Merge remote-tracking branch 'myk002/buildingplan_isenabled' into develop 2020-09-24 00:05:58 -04:00
Myk Taylor 72fb6d09d6 Merge remote-tracking branch 'upstream/develop' into buildingplan_isenabled 2020-09-23 19:21:16 -07:00
lethosor dfac5bc143
Update gui.Painter docs, add sections to dfhack.screen, add more links, etc 2020-09-23 22:00:39 -04:00
lethosor 692d9b0ceb
Merge remote-tracking branch 'myk002/buildingplan_format' into develop 2020-09-23 21:19:43 -04:00
lethosor b1f80b6d26
Update scripts 2020-09-23 20:05:45 -04:00
lethosor 577bb0a258
Merge remote-tracking branch 'myk002/buildingplan_format' into develop 2020-09-23 20:04:17 -04:00
Myk Taylor 42c42c1de9 Merge remote-tracking branch 'upstream/develop' into buildingplan_format 2020-09-22 23:26:18 -07:00
Myk Taylor 12769de232 revert dup isEnabled and document real isEnabled 2020-09-22 23:24:20 -07:00
Myk Taylor b73750e706 Merge remote-tracking branch 'upstream/develop' into buildingplan_isenabled 2020-09-22 22:53:01 -07:00
lethosor d43bf0ce44
Update dependencies 2020-09-21 12:27:27 -04:00
Myk Taylor c6111ba017 expose if buildingplan is enabled to lua 2020-09-20 16:38:26 -07:00
lethosor 9cf0508b90
Update scripts 2020-09-20 11:33:37 -04:00
lethosor c262877b43
Merge remote-tracking branch 'myk002/quickfort_dreamfort' into develop 2020-09-20 11:33:09 -04:00
lethosor 0e6e00af5e
getplants: fix crash when world_object_data is not present for certain blocks 2020-09-20 01:24:46 -04:00
lethosor 9d3a168cc3
Update scripts 2020-09-19 20:34:10 -04:00
lethosor 9c37a3a068
Add "createitem inspect" subcommand 2020-09-19 20:33:47 -04:00
lethosor be1bd54860
Merge branch 'deps-subdirectory' into develop 2020-09-19 20:17:22 -04:00
Myk Taylor 7cb77e8066 update dreamfort.csv
- use #notes blueprints instead of "invisible" "Notes" sheets
- remove smoothing guildhall blueprint
- rearrange statues in guildhall so no pre-smoothing is required
2020-09-19 15:42:24 -07:00
lethosor 8df8eb0c5d
Remove obsolete xlsxio_project dependency 2020-09-19 16:23:21 -04:00
lethosor 5952c16d87
Merge branch 'develop' into deps-subdirectory 2020-09-19 16:19:47 -04:00
lethosor 64b1202119
Fix some CMake warnings and extraneous output 2020-09-19 01:17:25 -04:00
lethosor 89210eaf29
Update libzip (static lib) 2020-09-18 17:01:30 -04:00
lethosor 650ab3a87a
Update libzip for older CMake (on Buildmaster) 2020-09-18 15:43:03 -04:00
lethosor 65b8071941
Use typedefs from xlsxio in PluginStatics.h
The typedefs in the header foward-declared new structs of the same names in the DFHack namespace, e.g. DFHack::xlsxio_read_struct. Apparently the constructors that used these typedefs are not inlined on Windows, so libdfhack was compiled with a constructor taking a "DFHack::xlsxio_read_sheet_struct", and xlsxreader was looking for a constructor taking just a "xlsxio_read_sheet_struct", which didn't exist.
2020-09-18 15:05:17 -04:00
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 7efadc85a6
Remove some unused config 2020-09-18 00:36:50 -04:00