Commit Graph

7417 Commits (75d7773a945d66e3cdda4c6c84685a7f93abff58)
 

Author SHA1 Message Date
Michael Casadevall c3188b1d6c Make our build checks relate to the new compiler world order
(thanks lethosor)

Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-28 07:13:52 -05:00
Michael Casadevall 62e8740e3a Backport new hash.h from git upstream to add support for VS2015
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-28 07:13:18 -05:00
Michael Casadevall e94804ca9f Convince the build system to generate VS2015 project files
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-28 06:53:23 -05:00
Kelly Kinkade 61bcfd4bf3 labormanager improvements
Add some debugging facilities. Change some hauling, construction, and
deconstruction labors to reflect changes in DF since 34.11.
2016-06-27 20:58:38 -05:00
Kelly Kinkade 2072dcc38d Rename autolabor2 to labormanager and bring up to date with current 2016-06-27 12:04:51 -05:00
lethosor 261da66660 Update ab9rf's name 2016-06-26 23:39:10 -04:00
Lethosor 421e7949e0 Merge pull request #951 from eswald/stockflow-43
Stockflow reaction updates
2016-06-26 21:37:15 -04:00
Eric Wald 060331de37 Stockflow reaction updates
SpinThread jobs now get the proper material category flag, and metal mechanisms can be ordered.
2016-06-26 19:22:53 -06:00
Japa 036c0f787c Send creature adult size through remotefortressreader.cpp 2016-06-23 21:26:00 +05:30
Japa 74c9abcb47 Send color modifier raws through remotefortressreader.cpp 2016-06-22 13:36:36 +05:30
Japa 069d6b67d6 Send all size modifiers through remotefortressreader. 2016-06-21 22:42:47 +05:30
Japa 5fff0efec5 Send appearance info over remotefortressreader.cpp 2016-06-20 22:59:59 +05:30
Japa b338d0218e Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-06-20 13:22:25 +05:30
Japa 9ef9a6b519 Send bodypart raws from RemoteFortressReader 2016-06-20 13:21:11 +05:30
Japa 36aafd550b Increased the message size limit in RemoteClient from 8mb to 64mb. 2016-06-20 13:17:30 +05:30
lethosor 6d1c4cd9ce Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-06-16 23:37:21 -04:00
lethosor a7d5c2132a update xml 2016-06-16 23:37:01 -04:00
Japa 980be6e2af Added a cleaner format for sending over region info. 2016-06-16 21:36:35 +05:30
Japa 0918efd02d fix word_wrap not returning a value. 2016-06-16 20:52:16 +05:30
lethosor 27a84a8246 Move scripts to library/scripts
git can't cope with replacing scripts/3rdparty/* submodules with a single
scripts submodule.
2016-06-15 18:45:08 -04:00
lethosor 9de4550fde Update submodules 2016-06-15 12:11:20 -04:00
lethosor 150441ab25 Merge remote-tracking branch 'PeridexisErrant/instant-docs' into develop 2016-06-15 11:04:51 -04:00
PeridexisErrant cfc322fb7f Improve handling of in-script documentation
Closes issue #823.  This allows for clean unification of html docs and
the in-terminal help text for scripts, including handling in core rather
than on a per-script basis (see issue #947).
2016-06-15 18:28:54 +10:00
PeridexisErrant e6d2f4ea2e Move Contributing.rst for Github banner link 2016-06-15 18:28:54 +10:00
lethosor 9da53a056e Update scripts (devel/send-key) 2016-06-15 00:03:43 -04:00
lethosor e1b9186663 Update scripts (more documentation) 2016-06-14 23:55:34 -04:00
lethosor 7156b3cfe2 Update scripts (documentation) 2016-06-14 23:42:51 -04:00
lethosor 022a1bf9e8 Wrap script descriptions in `ls` output and remove description length cap 2016-06-14 21:24:27 -04:00
lethosor a947586cf0 Add @hayguen to Authors.rst (clsocket) 2016-06-14 20:16:14 -04:00
lethosor 36d647a0de Update scripts 2016-06-14 20:15:42 -04:00
lethosor 09f310767f Update scripts 2016-06-14 19:46:13 -04:00
lethosor 53440a6f0d Add scripts submodule 2016-06-14 19:43:06 -04:00
lethosor 6258870e2c Remove scripts/ folder 2016-06-14 19:40:48 -04:00
Michael Casadevall 39c96c474a Fix ordering, news, and indentation
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-14 16:13:26 -04:00
lethosor 450fcdba31 Bump version to alpha1 2016-06-14 14:07:01 -04:00
lethosor 4f3a2b39d7 Update xml 2016-06-14 13:21:59 -04:00
lethosor f07bc03c69 Update clsocket and Open()/Listen() usage 2016-06-14 13:21:51 -04:00
Lethosor a2b2c66798 Merge pull request #931 from warmist/advfort2
Advfort2
2016-06-14 09:45:33 -04:00
Lethosor 9021fcab2e Merge pull request #946 from NCommander/fix-produce-structure
Modify DFHack to handle new produce() prototype. Major thanks to leth…
2016-06-13 17:24:22 -04:00
lethosor d51968f26e Update xml 2016-06-13 17:12:16 -04:00
Michael Casadevall 90c7dc41ec Update where library/xml to point to current master
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-13 17:10:58 -04:00
Michael Casadevall a03b32846a Modify DFHack to handle new produce() prototype. Major thanks to lethosor, and ragundo for their help in this
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-13 16:57:45 -04:00
lethosor f908a1d1b6 Replace catsplosion plugin with a script
Closes #938, #722
2016-06-11 21:44:15 -04:00
Michael Casadevall 628c8ee5bf Fix ordering in Authors.rst
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 06:10:18 -04:00
Michael Casadevall 0dc62a5c9c Add to NEWS.rst and authors
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 04:15:15 -04:00
Michael Casadevall e99187dc86 Add documentation for dwarfvet
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 04:15:09 -04:00
Michael Casadevall fead8a80ff Fix tabs to spaces
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 04:15:03 -04:00
Michael Casadevall e45fbfc61d Modified dwaftvet plugin to work with latest DFHack
Initial commit of the dwarfvet plugin

Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 04:14:59 -04:00
lethosor bcefb0205a Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-06-07 08:20:12 -04:00
lethosor a47a1c83ba Update xml, clsocket 2016-06-07 08:17:40 -04:00