541e0ca205
Merge https://github.com/rh73/dfhack
...
Conflicts:
plugins/changelayer.cpp
2012-03-29 18:42:45 +02:00
004acdad4e
Tweaks!
...
Strip commands.clear() from all plugins
Fix changeitem - a variable name has changed in item flags
2012-03-29 18:37:22 +02:00
836d8de73e
minor: commands.clear() is not needed in plugin_init() anymore. (done by pluginManager now)
...
removed some useless comments
2012-03-29 17:20:25 +02:00
e249ef1377
minor fix (forgot a line break in helpstring)
2012-03-29 17:14:41 +02:00
cc54d5dfa9
Merge branch 'master' of git://github.com/angavrilov/dfhack
...
Conflicts:
library/xml
2012-03-29 16:12:54 +02:00
4525bee58f
Merge branch 'master' of git://github.com/ab9rf/dfhack
...
Conflicts:
library/xml
2012-03-29 16:10:31 +02:00
9b75373403
Merge branch 'master' of git://github.com/peterix/dfhack
...
Conflicts:
library/xml
2012-03-29 16:03:12 +02:00
88c914142b
added plugin changeitem (change material type and base quality)
2012-03-29 15:33:54 +02:00
a9b7c74a23
Allow assigning NULL lightuserdata to pointers, and export a global.
...
Otherwise there is no way to specify NULL via recursive lua table assign.
2012-03-29 14:47:33 +04:00
85c91c92d8
Implement __pairs and __ipairs for DF objects.
...
Structs enumerate fields in memory order in pairs().
Containers & biftields enumerate int indexes in ipairs, and
string keys in pairs (i.e. using index-enum for arrays).
2012-03-29 14:39:13 +04:00
f6c6218909
Temporary tweak: patch in __pairs and __ipairs from 5.2 into lua 5.1.
2012-03-29 11:32:22 +04:00
17ff235c81
Use codegen.out.xml instead of static.inc in cmake code generation rules.
...
Now only that file is guaranteed to always be overwritten.
2012-03-29 10:59:54 +04:00
e968e936c7
Merge remote-tracking branch 'origin/master'
2012-03-28 23:24:35 -05:00
d9d1d34d5a
track
2012-03-28 23:24:05 -05:00
453141920f
Merge remote-tracking branch 'upstream/master'
2012-03-28 23:22:28 -05:00
fea34bfdde
autolabor: set reequip flag when appropriate. also tweaked scoring to reduce job clumping.
2012-03-28 21:57:08 -05:00
1a92f561fe
autolabor: set reequip flag when appropriate
2012-03-28 21:56:23 -05:00
d82120a3db
More fixes
...
Include unistd.h in linux process file
Fix assert in autolabor
Don't print 'script missing' error on DF start
2012-03-29 02:49:44 +02:00
757ad3334c
Track structures
2012-03-29 00:27:03 +02:00
1f5c586f62
Merge https://github.com/rh73/dfhack
2012-03-28 20:16:14 +02:00
6235d2e801
Merge https://github.com/angavrilov/dfhack
2012-03-28 19:53:10 +02:00
6ea0d810bb
Merge https://github.com/mikestewart/dfhack
2012-03-28 19:52:36 +02:00
84de54addb
Merge https://github.com/ab9rf/dfhack
2012-03-28 19:51:44 +02:00
95ec363a7f
Merge branch 'master' of https://github.com/peterix/dfhack
...
Conflicts:
library/LuaTypes.cpp
library/LuaWrapper.cpp
2012-03-28 11:51:49 -05:00
166392af62
Make autolabor accept "enable" and "disable" as well as "0" or "1".
...
Add ability to set target number of miners in autolabor with "autolabor miners".
2012-03-28 10:25:36 -05:00
e4e643f9d2
Clear the command vector during plugin load and unload to avoid confusion.
2012-03-28 18:47:03 +04:00
8775834a8a
Merge remote-tracking branch 'upstream/master'
2012-03-28 08:38:12 -05:00
b7ff7681ac
Merge remote-tracking branch 'peterix/master'
2012-03-28 15:07:13 +04:00
06188da380
Track structures
2012-03-28 12:46:50 +02:00
1343519bdb
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-28 12:15:30 +02:00
baf0785807
Merge branch 'master' of git://github.com/quietust/dfhack
...
Conflicts:
library/LuaTypes.cpp
library/LuaWrapper.cpp
2012-03-28 12:14:08 +02:00
4646033741
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-28 11:56:59 +02:00
4b2837dc39
Bump version to 0.34.06-1
2012-03-28 11:56:46 +02:00
40cf5fe538
Track structures
2012-03-28 11:46:23 +02:00
7c728a1e81
minor fix in readme.rst
2012-03-28 17:00:34 +08:00
cebdbff46d
minor updates in readme.rst; moved changelayer plugin to main plugin folder
2012-03-28 17:00:33 +08:00
515a4467e8
minor: fixed typo
2012-03-28 17:00:32 +08:00
929657bed4
Disable pointer auto-vivification unless new is specified.
...
Since it is essentially allocating non-gc managed objects,
it can lead to memory leaks and shouldn't happen invisibly.
Also support using the 'assign' key to request assign()
from another object before processing the current map.
2012-03-28 17:00:07 +08:00
fe091de0b2
Fix F keys in keybindings: they obviously don't have unicode symbols.
2012-03-28 17:00:06 +08:00
9604be2701
Fix crash in autolabor that happens when all dorfs decide to tipple at the same time
2012-03-28 16:59:38 +08:00
13d7beda4b
Dfusion crash fix
2012-03-28 16:58:52 +08:00
b76bdad50f
Implement recursive transfer of values from lua to c++ structures.
...
E.g. df.global.cursor = { x = 1, y = 2, z = 3 }. The lua data
must be represented by raw lua tables.
For structs, the entries in the table are assigned to matching fields.
For containers, if a 'resize' field is missing or nil, the table is
treated like 1-based lua array, and the container is resized to match
its # length. Otherwise, the field must be either an explicit number,
true or false. If it is true, the size is selected by the highest index
in the table. After that, entries are copied using 0-based indices.
For pointers, the table must match the target object. If the pointer
is null, the object is auto-allocated; this can be controlled using
the 'new' field, the value of which will be passed to df.new().
2012-03-28 16:58:51 +08:00
ee94894516
Disable pointer auto-vivification unless new is specified.
...
Since it is essentially allocating non-gc managed objects,
it can lead to memory leaks and shouldn't happen invisibly.
Also support using the 'assign' key to request assign()
from another object before processing the current map.
2012-03-28 11:28:42 +04:00
d6e6fc483f
Fix F keys in keybindings: they obviously don't have unicode symbols.
2012-03-28 11:25:55 +04:00
1566ae034f
Fix crash in autolabor that happens when all dorfs decide to tipple at the same time
2012-03-27 21:39:06 -05:00
abebb7fd2d
Merge https://github.com/warmist/dfhack
2012-03-27 15:56:03 -05:00
5e90af7400
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-27 22:48:07 +03:00
2afff2b2c8
Dfusion crash fix
2012-03-27 22:47:23 +03:00
be2a7af362
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-03-27 14:14:04 -05:00
6656852fff
win32 SetConsoleTextAttribute doesn't know what COLOR_RESET (-1) is
2012-03-27 13:22:45 -05:00
Petr Mrázek
Robert Heinrich
Alexander Gavrilov
Kelly Martin
Quietust
unknown
Warmist