72fb6d09d6
Merge remote-tracking branch 'upstream/develop' into buildingplan_isenabled
2020-09-23 19:21:16 -07:00
dfac5bc143
Update gui.Painter docs, add sections to dfhack.screen, add more links, etc
2020-09-23 22:00:39 -04:00
692d9b0ceb
Merge remote-tracking branch 'myk002/buildingplan_format' into develop
2020-09-23 21:19:43 -04:00
b1f80b6d26
Update scripts
2020-09-23 20:05:45 -04:00
577bb0a258
Merge remote-tracking branch 'myk002/buildingplan_format' into develop
2020-09-23 20:04:17 -04:00
42c42c1de9
Merge remote-tracking branch 'upstream/develop' into buildingplan_format
2020-09-22 23:26:18 -07:00
12769de232
revert dup isEnabled and document real isEnabled
2020-09-22 23:24:20 -07:00
b73750e706
Merge remote-tracking branch 'upstream/develop' into buildingplan_isenabled
2020-09-22 22:53:01 -07:00
d43bf0ce44
Update dependencies
2020-09-21 12:27:27 -04:00
c6111ba017
expose if buildingplan is enabled to lua
2020-09-20 16:38:26 -07:00
9cf0508b90
Update scripts
2020-09-20 11:33:37 -04:00
c262877b43
Merge remote-tracking branch 'myk002/quickfort_dreamfort' into develop
2020-09-20 11:33:09 -04:00
0e6e00af5e
getplants: fix crash when world_object_data is not present for certain blocks
2020-09-20 01:24:46 -04:00
9d3a168cc3
Update scripts
2020-09-19 20:34:10 -04:00
9c37a3a068
Add "createitem inspect" subcommand
2020-09-19 20:33:47 -04:00
be1bd54860
Merge branch 'deps-subdirectory' into develop
2020-09-19 20:17:22 -04:00
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
8df8eb0c5d
Remove obsolete xlsxio_project dependency
2020-09-19 16:23:21 -04:00
5952c16d87
Merge branch 'develop' into deps-subdirectory
2020-09-19 16:19:47 -04:00
64b1202119
Fix some CMake warnings and extraneous output
2020-09-19 01:17:25 -04:00
89210eaf29
Update libzip (static lib)
2020-09-18 17:01:30 -04:00
650ab3a87a
Update libzip for older CMake (on Buildmaster)
2020-09-18 15:43:03 -04:00
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
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
7efadc85a6
Remove some unused config
2020-09-18 00:36:50 -04:00
b85759620f
Switch libzip and xlsxio to be included with add_subdirectory(), disable xlsxio installation
2020-09-18 00:33:41 -04:00
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
b47710ae6f
Upgrade libexpat
...
Needed for a consistent target name: da7cda3a85
2020-09-17 20:09:13 -04:00
42d4d33571
Only modify xlsxreader target if it was created
...
Ref #1620
2020-09-17 15:41:29 -04:00
1efa09582a
Change libexpat to be included with add_subdirectory()
...
- Confirmed that libexpat is built statically and linked with xlsxreader
- May need da7cda3a85
2020-09-17 00:25:50 -04:00
6e9c2093d7
Merge remote-tracking branches 'myk002/quickfort_docs' and 'myk002/quickfort_room_alias_doc' into develop
2020-09-13 23:59:31 -04:00
8660355838
formally declare used globals in fortplan
2020-09-08 21:30:12 -07:00
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
da020c72de
quickfort: refresh aliases docs and doc r+ -> r+&
2020-09-02 16:53:32 -07:00
e0fec78481
final cleanup pass; add docs for dig priorities
2020-09-01 19:48:10 -07:00
8728056674
Update scripts
2020-09-01 00:17:32 -04:00
09b018bea6
stockpiles: remove sand_bags field
...
Fixes #1013
2020-08-29 20:04:09 -04:00
5aca88ef03
Update submodules
2020-08-29 20:02:33 -04:00
23dc7727b5
Merge remote-tracking branch 'kristjanmoore/develop' into develop
2020-08-29 17:43:46 -04:00
21f3c4ef28
Merge remote-tracking branch 'lethosor/cmake-external-toolset' into develop
2020-08-29 17:32:00 -04:00
d266a13a8e
Merge remote-tracking branches 'myk002/quickfort_hauling_aliases' and 'myk002/quickfort_library' into develop
2020-08-29 17:30:01 -04:00
d571f90f88
Update scripts
2020-08-29 17:29:33 -04:00
100ba998a1
Update changelog, authors ( #1633 )
2020-08-28 18:44:16 -04:00
ba2e974609
Merge remote-tracking branch 'GitOnUp/1602-restore-item-counts' into develop
...
Fixes #1602
2020-08-28 18:41:57 -04:00
595e07d451
light proofreading pass of quickfort user guide
2020-08-27 13:36:47 -07:00
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
f09b0fa699
quickfort: define useful aliases for hauling
2020-08-26 22:38:49 -07:00
60c74c4693
Merge remote-tracking branch 'upstream/develop' into quickfort_docs
2020-08-26 21:25:05 -07:00
3b5a82cc05
Change color of ListBox.select2_hint to grey to indicate enabled
...
Ref dfhack/scripts#185
2020-08-27 00:08:28 -04:00
5d43ba2178
quickfort: document marker mode and buildingplan
...
also a bit of cleanup and reorg
2020-08-26 19:59:30 -07:00
Myk Taylor
lethosor