1029e0f02a
Fix a few whitespace issues
...
From #992
2016-09-15 01:37:07 -04:00
39608f8a95
Merge remote-tracking branch 'dseguin/fix_cmake_64_linux' into develop
2016-09-15 01:35:52 -04:00
01a97f6487
Made pthread required for building protobuf
2016-09-08 17:12:42 -04:00
860e584006
Added @lethosor 's change
2016-09-08 11:28:15 -04:00
36b9ee5cf4
Added check to rescan zlib and pthread on linux
...
unset ZLIB_LIBRARY and CMAKE_HAVE_PTHREAD_H to rescan those libs
when arch changes from 32 to 64 (and vis-versa). There may be a
better way to do this.
2016-09-07 23:36:22 -04:00
8f2cc5bc4d
Fix and reorganize remotefortressreader includes
2016-09-04 16:06:26 -04:00
e205dc82a5
Merge pull request #991 from JapaMala/v0.43.03
...
Removed the other foreach.
2016-08-29 22:30:43 +05:30
1862106fd1
Removed the other foreach.
2016-08-29 22:29:40 +05:30
b09ee3407c
Merge branch 'v0.43.03' of https://github.com/JapaMala/dfhack into develop
...
Conflicts:
library/xml
plugins/remotefortressreader.cpp
2016-08-29 22:06:37 +05:30
af5d4ec5a8
removed foreach.
2016-08-29 21:43:20 +05:30
41e298bdfc
Update submodules
2016-08-27 15:27:57 -04:00
bbaf129adf
Fix ruby codegen for bitfields/enums with long base-type
2016-08-27 15:24:53 -04:00
7d145de4a7
Translate histfig mats into creature mats, rather than sending the entire histfig population.
2016-08-26 23:48:32 +05:30
91cb734a25
Send histfig materials over remotefortressreader.cpp, using unique ids.
2016-08-26 12:23:50 +05:30
5c3260c382
Actually check spatter amounts properly
2016-08-26 08:49:54 +05:30
db7be082ef
Only copy spatters if they actually have any amount.
2016-08-25 23:56:30 +05:30
012e5e2a3b
Add gui/manager-quantity keybinding
2016-08-25 12:14:44 -04:00
a3ab757642
Add spatters to remotefortressreader.cpp
2016-08-25 21:14:23 +05:30
85ebbf0e9c
Fix df_expr_to_ref for raw userdata
2016-08-24 17:18:55 -04:00
6ce470ad57
Add basic lua expression support to memview
...
Currently just supports basic field accesses (world.x, screen.y.z).
No support for world.x - 4, etc.
Closes #976
2016-08-24 16:26:34 -04:00
7487f44fc8
Implement a helper to create lua environments with shortcuts (e.g. scr, unit)
...
Used in gui/gm-editor and lua
Closes #977
2016-08-23 21:47:41 -04:00
ddc0c1b3cb
Merge pull request #970 from PeridexisErrant/update-init
...
Update the example init file
2016-08-23 18:05:18 -04:00
64e3b12f4f
Make docs/build.sh a bit more configurable
2016-08-23 15:54:11 -04:00
30601dc3fd
Update Compile.rst for GCC 4.8 and x64 changes, and general cleanup
...
Closes #980
2016-08-23 15:52:39 -04:00
7097b1f817
Add TC01, Qartar, milochristiansen to Authors.rst
2016-08-23 14:34:33 -04:00
f4b0c2fcfc
color-dfhack-text: Fix potential overflow issue
2016-08-22 23:18:58 -04:00
2dccd1d0ff
Add CheckedArray:__tostring() method
2016-08-22 23:18:30 -04:00
1dab45ffed
Replace lua_pushnumber with lua_pushinteger in LuaApi.cpp
2016-08-22 23:18:08 -04:00
5d87a10511
Merge pull request #979 from PeridexisErrant/core-commands
...
Core.rst: document how commands work and are used
2016-08-22 19:29:37 -04:00
3d2f7d426d
Update the example init file
...
After updating the extra init file in my pack, I realised that many of
the changes could be merged into the standard init.
This enables a few more UI improvements, adds neglected keybindings, and
removes the roses-init and binpatches sections (third-party only and
obsolete respectively).
2016-08-22 18:12:09 +10:00
93ac937cb9
Add new job types to autohauler
2016-08-21 22:24:41 -04:00
e983e66a1a
Update xml and scripts
2016-08-21 20:59:24 -04:00
70ac99cbfa
Fix Buildings::setOwner() persistence
...
Needed to set bld->owner_id for changes to persist across save/load
Fixes #983 , thanks to Quietust
2016-08-21 20:58:40 -04:00
9171149afb
Update submodule refs
2016-08-18 23:42:17 -04:00
98a187ca43
Update xml
2016-08-18 17:28:44 -04:00
9e4a6d7591
Update default base address on 64-bit Linux
2016-08-18 17:28:18 -04:00
0b6597ddb2
Stop field_offset from crashing due to missing vtables
...
Now, a pointer to NULL is cast to the type in question, avoiding the need to
call new() or delete() with potentially-misaligned types. Also,
virtual_identity::find has been tweaked to prevent it from crashing on NULL
vtable pointers.
This was suggested by Angavrilov.
2016-08-18 15:59:46 -04:00
c2997b9c79
Fix save_dir
2016-08-18 15:47:40 -04:00
de731b0299
Move save_dir back into cur_savegame and update submodules
2016-08-14 12:41:09 -04:00
e965f5318f
Replace many includes with forward declarations in modules/Maps.h
2016-08-13 21:44:01 -04:00
576174ea0b
Lua: Add lengths of (some) containers to their string representations
2016-08-13 19:52:14 -04:00
18a8512242
Fix LLONG_MAX/LLONG_MIN in luaconf.h with old glibc versions
2016-08-13 11:40:30 -04:00
570ac8d719
Add link to createitem wiki page
2016-08-13 15:46:15 +10:00
468cca3f09
Improve docs on use of OS terminal for DFHack cmds
2016-08-13 13:42:12 +10:00
bb66ec6aee
Add 'Using Commands' to docs, with pull#767 syntax
...
Plus consequential changes and minor updates to the table of contents.
2016-08-13 12:51:19 +10:00
a1c25570df
Move labormanager to plugins/, per request
2016-08-11 23:49:15 -04:00
99813038e9
Update labormanager for unit.relations removal and fix warnings
2016-08-11 23:42:58 -04:00
bceeea39ba
Merge remote-tracking branch 'ab9rf/develop' (labormanager) into develop
2016-08-11 23:37:22 -04:00
1a79e7456c
Add shell script to build docs
...
Useful for testing docs without changing BUILD_DOCS if it's set to OFF.
2016-08-11 18:43:34 -04:00
a55ce5f1d9
labormanager: whitespace
2016-08-11 16:58:35 -05:00
lethosor
David Seguin
Japa
Lethosor
PeridexisErrant
Kelly Kinkade