Commit Graph

7238 Commits (ddd56d7825f121deac70cd89676a1bf6d445067e)
 

Author SHA1 Message Date
lethosor ddd56d7825 Fix (for win64) and avoid duplicating base address 2016-07-27 20:10:03 -04:00
lethosor 50144b60ea A few %08x to %p changes 2016-07-27 19:54:19 -04:00
Vitaly Pronkin 8916aba3bf win64 fixes (partial)
cherry-picked from 2f734ae2317060edb83021f17cffc966c435ad7b
2016-07-27 19:46:49 -04:00
Vitaly Pronkin 709111ea33 Add win64 build scripts 2016-07-27 19:35:51 -04:00
lethosor 99dbf20c08 Reorganize win32 build scripts 2016-07-27 19:34:24 -04:00
Vitaly Pronkin fe18f176f7 More 64-bit fixes
Cherry-picked from 7eb3ba6
- Lua update already done in e2c6350, 4dd411e
- Excluded library/modules/Buildings.cpp
2016-07-26 23:47:53 -04:00
Vitaly Pronkin 3833ff2e09 proper 64bit address formatting 2016-07-26 23:30:50 -04:00
Vitaly Pronkin 4dd411e862 Update Lua config and patch checkdp 2016-07-26 23:29:26 -04:00
lethosor e2c6350978 Update Lua to 5.3.3 2016-07-26 23:23:26 -04:00
lethosor a684e1dd0f Merge remote-tracking branch 'lethosor/64-bit' into develop 2016-07-26 22:54:36 -04:00
lethosor 29963f4b67 Rename script-in-readme to script-docs 2016-07-26 22:51:42 -04:00
lethosor eef66b0db1 Get rid of OS X path restrictions (see package/linux/dfhack) 2016-07-12 14:54:06 -04:00
lethosor e357d9e40b OSX -> OS X 2016-07-12 14:53:22 -04:00
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
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
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
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
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