Commit Graph

3397 Commits (1618ccf5bb4044cdde97d45ef9e6173150cdddbc)
 

Author SHA1 Message Date
Petr Mrázek 84de54addb Merge https://github.com/ab9rf/dfhack 2012-03-28 19:51:44 +02:00
Quietust 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
Kelly Martin 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
Alexander Gavrilov e4e643f9d2 Clear the command vector during plugin load and unload to avoid confusion. 2012-03-28 18:47:03 +04:00
Kelly Martin 8775834a8a Merge remote-tracking branch 'upstream/master' 2012-03-28 08:38:12 -05:00
Alexander Gavrilov b7ff7681ac Merge remote-tracking branch 'peterix/master' 2012-03-28 15:07:13 +04:00
Petr Mrázek 06188da380 Track structures 2012-03-28 12:46:50 +02:00
Robert Heinrich 1343519bdb Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-28 12:15:30 +02:00
Robert Heinrich 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
Robert Heinrich 4646033741 Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-28 11:56:59 +02:00
Petr Mrázek 4b2837dc39 Bump version to 0.34.06-1 2012-03-28 11:56:46 +02:00
Petr Mrázek 40cf5fe538 Track structures 2012-03-28 11:46:23 +02:00
Robert Heinrich 7c728a1e81 minor fix in readme.rst 2012-03-28 17:00:34 +08:00
Robert Heinrich cebdbff46d minor updates in readme.rst; moved changelayer plugin to main plugin folder 2012-03-28 17:00:33 +08:00
Robert Heinrich 515a4467e8 minor: fixed typo 2012-03-28 17:00:32 +08:00
Alexander Gavrilov 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
Alexander Gavrilov fe091de0b2 Fix F keys in keybindings: they obviously don't have unicode symbols. 2012-03-28 17:00:06 +08:00
unknown 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
Warmist 13d7beda4b Dfusion crash fix 2012-03-28 16:58:52 +08:00
Alexander Gavrilov 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
Alexander Gavrilov 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
Alexander Gavrilov d6e6fc483f Fix F keys in keybindings: they obviously don't have unicode symbols. 2012-03-28 11:25:55 +04:00
unknown 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
Quietust abebb7fd2d Merge https://github.com/warmist/dfhack 2012-03-27 15:56:03 -05:00
Warmist 5e90af7400 Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-27 22:48:07 +03:00
Warmist 2afff2b2c8 Dfusion crash fix 2012-03-27 22:47:23 +03:00
Quietust be2a7af362 Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-03-27 14:14:04 -05:00
Quietust 6656852fff win32 SetConsoleTextAttribute doesn't know what COLOR_RESET (-1) is 2012-03-27 13:22:45 -05:00
Alexander Gavrilov bc74c5984e 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-27 21:47:52 +04:00
Mike Stewart b57ab1493c Look for df-structures instead of protobuf in the submodule check. 2012-03-27 08:42:49 -07:00
Quietust 2ac562d4d7 Add missing array terminator - without this, Release builds crash on startup 2012-03-27 10:23:11 -05:00
Robert Heinrich 13effd5ac5 minor fix in readme.rst 2012-03-27 12:06:46 +02:00
Robert Heinrich ca6b8aac42 Merge remote-tracking branch 'upstream/master' 2012-03-27 11:29:40 +02:00
Robert Heinrich e41e9c24f1 minor updates in readme.rst; moved changelayer plugin to main plugin folder 2012-03-27 11:28:10 +02:00
Mike Stewart 92bae9d652 Removed dead check... 2012-03-26 16:39:16 -07:00
Mike Stewart 4ed6953bb6 Added a test for submodules that prints out a helpful error message. 2012-03-26 16:37:37 -07:00
Petr Mrázek d2d16271f0 Track stonesense 2012-03-27 01:30:46 +02:00
Alexander Gavrilov 22d775f95c Fix sscanf parsing the memory map on linux, so that dfusion loads. 2012-03-26 21:05:24 +04:00
Warmist 3761426ef5 Extern "C" mess fixed, bitlib mess fixed, bitlib added to autoload. 2012-03-26 18:48:24 +03:00
Warmist 18c94f8000 Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-26 18:14:14 +03:00
Warmist 61f0bc66af small changes to tools(lua) 2012-03-26 18:12:32 +03:00
Petr Mrázek b4d458b47f Track stonesense 2012-03-26 16:16:19 +02:00
Petr Mrázek 4e78947b10 Track structures 2012-03-26 16:13:41 +02:00
Petr Mrázek 047ccdf43a Merge https://github.com/angavrilov/dfhack 2012-03-26 16:13:36 +02:00
Robert Heinrich 213acd054a minor: fixed typo 2012-03-26 14:59:18 +02:00
Robert Heinrich eb5a364924 minor: replace tabs with spaces 2012-03-26 12:36:03 +02:00
Robert Heinrich 517fc310bf documented changelayer plugin 2012-03-26 12:27:32 +02:00
Alexander Gavrilov 157f23be5c Fix warnings. 2012-03-26 12:42:05 +04:00
Robert Heinrich d50f42e4f3 Merge remote-tracking branch 'angavrilov/master' 2012-03-26 10:36:21 +02:00
Alexander Gavrilov 00a5bfcf3e Work around a msvc issue with spurious specialization ambiguity errors. 2012-03-26 10:46:51 +04:00