MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,825 Commits
1 Branch
0 Tags
40 MiB
Commit Graph

7825 Commits (ac1d6f947fb84de102d321e81152d5fca144d3fa)
 

Author SHA1 Message Date
Kelly Kinkade a55ce5f1d9 labormanager: whitespace 2016-08-11 16:58:35 -05:00
Kelly Kinkade 5ab930ba4d labormanager: small tweaks 
Handle cloth crafts correctly; handle pit jobs correctly; handle
bookcase construction correctly; deal with new break behavior better;
change assignment of clean labor; tweak hauling assignments slightly to
avoid overallocation; assign pull lever to everyone and clean to all
nonbusy dwarfs
 2016-08-11 16:56:34 -05:00
lethosor 9b495fe08b Add load-save.lua 
Ref #755
 2016-08-11 12:51:34 -04:00
lethosor fe6968f01d Fix script-docs.py error with missing opening token 2016-08-11 11:57:42 -04:00
lethosor eef6f9bfb7 Add df.new() support for char and unsigned long 2016-08-11 00:01:52 -04:00
lethosor a1ff432bf8 Restore fixed-width types in string representations of lua fields 
e.g. tostring(df.new('int16_t')) was returning "<short: 0xaddr>"
 2016-08-10 23:58:45 -04:00
lethosor 215afa34f3 Update for 64-bit unit changes 
Includes xml, stonesense, scripts

Ref DFHack/df-structures@25cb373
 2016-08-10 23:50:00 -04:00
lethosor acc4a6a0b1 Set CMAKE_POSITION_INDEPENDENT_CODE 
Needed on 64-bit Linux
 2016-08-10 15:48:47 -04:00
lethosor 1b11c46a98 ruby.cpp: uint32_t -> uintptr_t 2016-08-10 15:24:07 -04:00
Lethosor 6e741b1a80 Merge pull request #969 from Qartar/win64 
Minor fixes/updates for Visual Studio 2015 Win64
 2016-08-10 15:15:44 -04:00
lethosor 53a0d73d23 Add new title-folder plugin 2016-08-09 20:09:50 -04:00
lethosor 02eef95147 Fix base address for Darwin x64 2016-08-09 20:00:31 -04:00
lethosor b9092c94f5 Don't search for 32-bit zlib when targeting 64-bit Linux 2016-08-09 19:10:38 -04:00
lethosor aa47484b2a Enable bit32 library 
Deprecated in Lua 5.3, but still contains some useful things, like extract()

Also helps maintain backward-compatibility with scripts that target older DF
versions (e.g. Mifki's dfremote project)
 2016-08-09 18:57:24 -04:00
lethosor b211177a27 Fix version in docs for non-stable releases 2016-08-09 10:07:22 -04:00
lethosor 9c28d1a085 Improve CMake file downloads 
- Files are redownloaded if their expected MD5 changes in CMakeLists.txt
- Refactored some
 2016-08-08 16:51:52 -04:00
lethosor e22b3b1de7 Use non-fixed-width types in integer identity_traits definitions 
In some situations (e.g. 32-bit Linux), "intptr_t" is defined as "int", which is
equivalent to "int32_t", leading to issues with duplicate definitions. In other
situations with GCC, "intptr_t" is "long", which isn't covered by any intNN_t
types. Also, definitions for "long" already had to be added on Windows, because
no fixed-width types in MSVC are equivalent to "long".

Switching to non-fixed-width types should hopefully cover all of these
situations. If this doesn't cover any integer types that we need, it will
be caught quickly, e.g. by references to integer_traits<T> in LuaWrapper.cpp.
 2016-08-08 11:46:20 -04:00
lethosor 298d16238e Remove a few unneeded includes in DataStaticsFields.cpp 2016-08-08 11:45:00 -04:00
Lethosor 72900fdfae Merge pull request #975 from Qartar/ruby 
Add windows container sizes to ruby codegen
 2016-08-07 16:31:08 -04:00
Carter Bray 5fef2ad075 Add windows container sizes to ruby codegen 2016-08-07 10:11:17 -07:00
lethosor aeac8b4fef Update xml 2016-08-05 18:04:42 -04:00
lethosor ee7357b60e x86: fix vector validity check 2016-08-05 17:51:08 -04:00
lethosor dde6901534 x86: fix lua address display 2016-08-05 17:50:49 -04:00
lethosor ddbb1b5bb8 ruby: Update sizes for some types 
Many are still incomplete on x64, especially on Windows
 2016-08-05 17:29:24 -04:00
lethosor dbd2e71920 Ruby codegen integer improvements 
- Add uint64_t
- Add special case for long on different platforms
- Require OS and architecture to be specified

NOTE: integer alignment on x64 is probably still incorrect
 2016-08-05 17:12:07 -04:00
lethosor ef569dc5a1 Pass OS and architecture to ruby codegen explicitly 
- Passing the architecture is needed to determine sizeof(long)
- Passing the OS prevents potential issues when cross-compiling between Windows
  and non-Windows (although this is unlikely)
 2016-08-05 17:09:25 -04:00
Japa 697aa54fa6 Sent tree and stone layers through remotefortressreader.cpp, and correct town placement. 2016-08-05 00:40:10 +05:30
Japa 8a97b54bcd Send wall info 2016-08-03 16:32:51 +05:30
Japa 2fda01d90b Add support for site towers. 2016-08-03 10:22:30 +05:30
Japa 9189e3dc7e Send world buildings through remotefortressreader.cpp 2016-08-02 10:30:17 +05:30
Carter Bray 44913609c8 Fix format string warnings 2016-08-01 19:03:26 -07:00
Carter Bray 9da2dcb8a2 Fix raw_vcall on Win64 builds 
MSVC's call conventions on x64 are the same for normal function calls and
member function calls (with the addition of the implicit 'this'
parameter).
 2016-07-31 17:01:57 -07:00
Carter Bray 3b9d37abe5 Suppress integer conversion warnings inside protobuf source 2016-07-31 17:01:52 -07:00
Carter Bray 625fbbec1d Automatically detect architecture based on Visual Studio generator 
DFHACK_BUILD_ARCH is no longer cached on Windows since it is not possible
to build Win32 targets with the Win64 generator or vice versa. No change
for GCC builds.
 2016-07-31 17:01:47 -07:00
lethosor 60cf860450 Merge branch 'develop' of dfhack/dfhack into develop 2016-07-29 19:15:53 -04:00
lethosor 6e1777e1e3 Remove _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS 
Fixed by #959
 2016-07-29 19:13:19 -04:00
lethosor 497503b707 Update scripts (find-offsets) 2016-07-29 19:12:14 -04:00
lethosor 79377669a1 Merge remote-tracking branch 'NCommander/dwarfvet' into develop 2016-07-29 16:25:53 -04:00
lethosor 158f18106f Merge remote-tracking branch 'NCommander/vs2015' into develop 2016-07-29 15:30:32 -04:00
lethosor 55970a71ab Fix Lua::Push for enums 2016-07-29 11:06:16 -04:00
lethosor e8fe72826f Add new integer types to memscan and update find-offsets 2016-07-29 00:05:12 -04:00
lethosor dc79e2477b Expose long/[u]intptr_t to lua and fix some integer return values 2016-07-29 00:02:51 -04:00
lethosor b7856fd9f2 Use enable_if for Lua::Push specializations 2016-07-28 22:04:46 -04:00
lethosor 7b7f7a1b79 Fix support for integer fields in Lua 5.3 2016-07-28 16:36:02 -04:00
lethosor afde73a673 memview: Fix pointer size on x64 2016-07-28 11:45:35 -04:00
lethosor eeb7f05483 vectors: Fix pointer parsing and display 2016-07-28 11:44:54 -04:00
lethosor 71e4f4ec62 Fix pointer-size-related compile errors in dev plugins 2016-07-28 11:40:17 -04:00
Japa 98230e9078 Send surface material with the worldmap in remotefortressreader.cpp 2016-07-28 20:52:14 +05:30
lethosor 41a81f9021 Fix some more warnings (GCC 4.8) 2016-07-28 11:00:52 -04:00
lethosor adff13f4ab Lua: re-enable C++ exceptions (re 42c620b) 2016-07-27 21:44:25 -04:00