4f96bdd0eb
Merge pull request #950 from TC01/linux-system-tinyxml
...
Support linking against an external tinyxml if EXTERNAL_TINYXML is set
2016-07-06 20:37:28 -04:00
2de2e6a983
Update CMakeLists and submodules
2016-07-06 20:30:28 -04:00
233a5e9c10
Update scripts
2016-07-03 23:30:03 -04:00
46f5280b13
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-06-30 20:45:27 -04:00
163207e362
Give more feedback for DF detection failures with mismatched XML versions
...
This may help address issues where people forget to read the documentation,
don't run "git submodule update", and end up with a df-structures version
that's too old (which is somewhat common, it turns out).
2016-06-30 20:42:27 -04:00
13b328beeb
Remove tabs
2016-06-30 15:14:20 +05:30
b37afa4591
Remove tabs
2016-06-30 15:12:28 +05:30
b196ecf351
Send over material tissues through RemoteFortressReader
2016-06-30 14:33:15 +05:30
cfaba3ec71
Update various references to scripts/ and mention old git issues in Compile.rst
2016-06-29 19:38:15 -04:00
85a920d1df
Re-add the scripts submodule, with a different internal name
...
This will break existing clones when using git versions before 1.8.1, which do
not support the --name option of "git submodule add", unless steps are taken to
remove the old scripts submodules in .git/modules (see Compile.rst).
2016-06-29 19:07:45 -04:00
af906d6582
Remove library/scripts submodule
2016-06-29 19:06:00 -04:00
ae55d2d526
Support linking against an external tinyxml if EXTERNAL_TINYXML is set
...
As best as I can tell, the copy of tinyxml dfhack uses is unmodified
from whenever it was first bundled. This commit adds an option to CMake,
EXTERNAL_TINYXML, that if set to ON, will attempt to link against a system
tinyxml instead of using the dfhack-bundled one. It defaults to OFF,
so there is no change in default behavior.
The DFHACK_TINYXML variable is then set to either "tinyxml" or "dfhack-tinyxml"
so the library (and any plugins that need updating) can link against one
or the other.
The FindTinyXML.cmake script was taken from https://github.com/ros/cmake_modules
(licensed under the 3-clause BSD license).
Add license text to new CMake file.
2016-06-29 17:53:16 -04:00
261da66660
Update ab9rf's name
2016-06-26 23:39:10 -04:00
421e7949e0
Merge pull request #951 from eswald/stockflow-43
...
Stockflow reaction updates
2016-06-26 21:37:15 -04:00
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
036c0f787c
Send creature adult size through remotefortressreader.cpp
2016-06-23 21:26:00 +05:30
74c9abcb47
Send color modifier raws through remotefortressreader.cpp
2016-06-22 13:36:36 +05:30
069d6b67d6
Send all size modifiers through remotefortressreader.
2016-06-21 22:42:47 +05:30
5fff0efec5
Send appearance info over remotefortressreader.cpp
2016-06-20 22:59:59 +05:30
b338d0218e
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-06-20 13:22:25 +05:30
9ef9a6b519
Send bodypart raws from RemoteFortressReader
2016-06-20 13:21:11 +05:30
36aafd550b
Increased the message size limit in RemoteClient from 8mb to 64mb.
2016-06-20 13:17:30 +05:30
6d1c4cd9ce
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-06-16 23:37:21 -04:00
a7d5c2132a
update xml
2016-06-16 23:37:01 -04:00
980be6e2af
Added a cleaner format for sending over region info.
2016-06-16 21:36:35 +05:30
0918efd02d
fix word_wrap not returning a value.
2016-06-16 20:52:16 +05:30
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
9de4550fde
Update submodules
2016-06-15 12:11:20 -04:00
150441ab25
Merge remote-tracking branch 'PeridexisErrant/instant-docs' into develop
2016-06-15 11:04:51 -04:00
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
e6d2f4ea2e
Move Contributing.rst for Github banner link
2016-06-15 18:28:54 +10:00
9da53a056e
Update scripts (devel/send-key)
2016-06-15 00:03:43 -04:00
e1b9186663
Update scripts (more documentation)
2016-06-14 23:55:34 -04:00
7156b3cfe2
Update scripts (documentation)
2016-06-14 23:42:51 -04:00
022a1bf9e8
Wrap script descriptions in `ls` output and remove description length cap
2016-06-14 21:24:27 -04:00
a947586cf0
Add @hayguen to Authors.rst (clsocket)
2016-06-14 20:16:14 -04:00
36d647a0de
Update scripts
2016-06-14 20:15:42 -04:00
09f310767f
Update scripts
2016-06-14 19:46:13 -04:00
53440a6f0d
Add scripts submodule
2016-06-14 19:43:06 -04:00
6258870e2c
Remove scripts/ folder
2016-06-14 19:40:48 -04:00
450fcdba31
Bump version to alpha1
2016-06-14 14:07:01 -04:00
4f3a2b39d7
Update xml
2016-06-14 13:21:59 -04:00
f07bc03c69
Update clsocket and Open()/Listen() usage
2016-06-14 13:21:51 -04:00
a2b2c66798
Merge pull request #931 from warmist/advfort2
...
Advfort2
2016-06-14 09:45:33 -04:00
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
d51968f26e
Update xml
2016-06-13 17:12:16 -04:00
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
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
f908a1d1b6
Replace catsplosion plugin with a script
...
Closes #938 , #722
2016-06-11 21:44:15 -04:00
bcefb0205a
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-06-07 08:20:12 -04:00
Lethosor
lethosor
Japa
Ben Rosser
Eric Wald
PeridexisErrant
Michael Casadevall