824275b23b
Rename autolabor2 to labormanager and bring up to date with current
2016-07-11 22:39:41 -05:00
bcffc53d5a
labormanager: add labors for bookcase (de)construct
2016-07-11 22:29:38 -05:00
e10397370b
Merge branch 'develop' of github.com:DFHack/dfhack into vs2015
2016-07-11 18:59:22 -05:00
ed6fb69012
Fix whitespace spacing
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-07-11 18:54:03 -05:00
7f1d4506d4
labormanager: fix several job-to-labor mappings
2016-07-07 02:10:43 -05:00
98893793bd
Turn off prerelease flag
2016-07-06 21:27:54 -04:00
cede0528f2
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-07-06 21:00:20 -04:00
39aa143cfa
Update NEWS and submodules
2016-07-06 20:59:49 -04:00
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
a386228f0e
labormanager: add StoreItemInLocation labor, reduce tool churn
...
Note: this commit requires updated df-structures (77968973b28d0e828f880d119a700abb079f3521 or later)
2016-07-05 13:16:34 -05:00
b4063352cf
Fix crash in vprinterr due to va_list misuse
2016-07-03 23:33:07 -04:00
2455e36510
Initial 64-bit support
2016-07-03 23:32:43 -04:00
233a5e9c10
Update scripts
2016-07-03 23:30:03 -04:00
d8f4d79b97
labormanager: significant restructuring to use job posting list
...
Updated here to get potential jobs off the job posting lists, which is
apparently where certain map-designated live after being designated but
before they move to the actual job list. Also changes to how tools are
handled, and lever pulling is assigned by default to all idle dwarfs.
2016-06-30 23:58:56 -05: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
857058752b
labormanager: rework for better behavior with 43.03
...
The main thing here is that the process loop exits if the DF process_job
or process_dig flags are set since if these are set the job list is
going to change soon anyway. The plugin also sets these flags when it
changes any labors, which has the side effect of effectively disabling
the process loop while DF is paused, which prevents flapping while
editing job preferences in-game, and also allows changing job
preferences in game (although such changes may not last when the clock
starts up again).
2016-06-29 14:54:03 -05:00
b45fb7c564
labormanager: fix stupid
2016-06-28 23:28:44 -05:00
1927eda6f3
labormanager: whitespace
...
MSVC is evil.
2016-06-28 22:57:12 -05:00
b516c8e0dc
labormanager: more tweaks to bring up to date
...
This update fixes some labors and attempts to address changes in the way
DF maintains the job list.
2016-06-28 22:36:45 -05:00
d509cf2fb5
It helps when you pop pragmas
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-28 09:39:46 -05:00
d49032ef73
Supress a lot of compiler noise in hopes of finding real errors. Right now, a plugin free DFHack can be built with VS2015
2016-06-28 08:34:11 -05:00
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
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
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
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
2072dcc38d
Rename autolabor2 to labormanager and bring up to date with current
2016-06-27 12:04:51 -05: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
Kelly Kinkade
Michael Casadevall
lethosor
Lethosor
Japa
Ben Rosser
Eric Wald