Commit Graph

7459 Commits (04ad7a0a42fedd3a0a33c4c0b2c9380f1341b900)
 

Author SHA1 Message Date
lethosor af6fed58f0 Add @mlindner to Authors.rst 2016-07-12 14:51:31 -04:00
Matthew Lindner ed96725293 Add protection from spaces in path and add warning in documentation 2016-07-12 14:44:18 -04:00
Kelly Kinkade 685fe4d2a8 Merge branch 'develop' of https://github.com/ab9rf/dfhack into develop 2016-07-11 22:42:18 -05:00
Kelly Kinkade 74f6f3d416 labormanager: add labors for bookcase (de)construct 2016-07-11 22:39:41 -05:00
Kelly Kinkade 874a97ed9f labormanager: fix several job-to-labor mappings 2016-07-11 22:39:41 -05:00
Kelly Kinkade 808afca9f0 labormanager: add StoreItemInLocation labor, reduce tool churn
Note: this commit requires updated df-structures (77968973b28d0e828f880d119a700abb079f3521 or later)
2016-07-11 22:39:41 -05:00
Kelly Kinkade 0509c455dd 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-07-11 22:39:41 -05:00
Kelly Kinkade 3a0ba332d9 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-07-11 22:39:41 -05:00
Kelly Kinkade dbc46c510f labormanager: fix stupid 2016-07-11 22:39:41 -05:00
Kelly Kinkade 705134975d labormanager: whitespace
MSVC is evil.
2016-07-11 22:39:41 -05:00
Kelly Kinkade f095e139aa 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-07-11 22:39:41 -05:00
Kelly Kinkade 07e1c81969 labormanager improvements
Add some debugging facilities. Change some hauling, construction, and
deconstruction labors to reflect changes in DF since 34.11.
2016-07-11 22:39:41 -05:00
Kelly Kinkade 824275b23b Rename autolabor2 to labormanager and bring up to date with current 2016-07-11 22:39:41 -05:00
Kelly Kinkade bcffc53d5a labormanager: add labors for bookcase (de)construct 2016-07-11 22:29:38 -05:00
Michael Casadevall e10397370b Merge branch 'develop' of github.com:DFHack/dfhack into vs2015 2016-07-11 18:59:22 -05:00
Michael Casadevall ed6fb69012 Fix whitespace spacing
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-07-11 18:54:03 -05:00
Kelly Kinkade 7f1d4506d4 labormanager: fix several job-to-labor mappings 2016-07-07 02:10:43 -05:00
lethosor 98893793bd Turn off prerelease flag 2016-07-06 21:27:54 -04:00
lethosor cede0528f2 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-07-06 21:00:20 -04:00
lethosor 39aa143cfa Update NEWS and submodules 2016-07-06 20:59:49 -04:00
Lethosor 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
lethosor 2de2e6a983 Update CMakeLists and submodules 2016-07-06 20:30:28 -04:00
Kelly Kinkade 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
lethosor b4063352cf Fix crash in vprinterr due to va_list misuse 2016-07-03 23:33:07 -04:00
lethosor 2455e36510 Initial 64-bit support 2016-07-03 23:32:43 -04:00
lethosor 233a5e9c10 Update scripts 2016-07-03 23:30:03 -04:00
Kelly Kinkade 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
lethosor 46f5280b13 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-06-30 20:45:27 -04:00
lethosor 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
Japa 13b328beeb Remove tabs 2016-06-30 15:14:20 +05:30
Japa b37afa4591 Remove tabs 2016-06-30 15:12:28 +05:30
Japa b196ecf351 Send over material tissues through RemoteFortressReader 2016-06-30 14:33:15 +05:30
lethosor cfaba3ec71 Update various references to scripts/ and mention old git issues in Compile.rst 2016-06-29 19:38:15 -04:00
lethosor 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
lethosor af906d6582 Remove library/scripts submodule 2016-06-29 19:06:00 -04:00
Ben Rosser 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
Kelly Kinkade 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
Kelly Kinkade b45fb7c564 labormanager: fix stupid 2016-06-28 23:28:44 -05:00
Kelly Kinkade 1927eda6f3 labormanager: whitespace
MSVC is evil.
2016-06-28 22:57:12 -05:00
Kelly Kinkade 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
Michael Casadevall d509cf2fb5 It helps when you pop pragmas
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-28 09:39:46 -05:00
Michael Casadevall 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
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