4e7ca99db1
Update scripts
2020-10-01 21:31:59 -04:00
93d43ba9e3
Update changelog ( #1620 , #1660 )
2020-09-29 20:08:35 -04:00
17bc4cd365
Merge remote-tracking branch 'myk002/buildingplan_item_match' into develop
2020-09-29 20:04:02 -04:00
b144973640
Merge remote-tracking branch 'myk002/buildings_vectors' into develop
2020-09-29 18:51:14 -04:00
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
3c51bb51ab
remove references to non-existent vector ids
2020-09-28 23:14:13 -07:00
6cc1428199
Merge remote-tracking branch 'upstream/develop' into buildings_vectors
2020-09-28 23:13:13 -07:00
d9d949096e
Merge remote-tracking branch 'upstream/develop' into buildingplan_refactor
2020-09-26 23:45:28 -07:00
74a3e0eddf
Use a string and .reserve for normalizing instead of stringbuf
2020-09-24 15:22:58 -07:00
f5c3712778
Nicer formatting for the normalized character mapping table
2020-09-24 14:32:58 -07:00
38c9c28250
Fix wrong variable usage in to_search_normalized
2020-09-24 10:52:03 -07:00
a3c565b243
Add to_search_normalized to search for characters with accents
2020-09-24 07:31:10 -07:00
3c037ef52a
Clean up plugin mkmodule/require explanation
2020-09-24 00:16:32 -04:00
945cd2e43e
Merge remote-tracking branch 'myk002/buildingplan_isenabled' into develop
2020-09-24 00:05:58 -04:00
1c2761f903
enable all in quickfort mode
...
and simplify logic since new bool map values are already initialized to
false
2020-09-23 20:00:04 -07:00
323d377f63
Merge remote-tracking branch 'upstream/develop' into buildingplan_refactor
2020-09-23 19:21:49 -07:00
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
d3520a2f5f
Fix createitem to properly create plant growths ( #898 )
2020-09-20 16:11:41 -06: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
11ee3a223d
enumnick: command added to 'zone' plugin and other QoL improvements
...
zone: enumnick command create nick for creature from given prefix and number
uinfo displays "Matched creatures" i.e number of creatures matched by filter
maxage, and minage filters accept float now
slaughter flag displayed on uinfo cretures list
2020-09-19 14:52:16 +02: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
f837532b42
use more precise item vectors for bld item filters
2020-09-13 17:12:29 -07:00
lethosor
Myk Taylor
George Murray
Quietust
PassionateAngler