Commit Graph

2879 Commits (ac0e4a15e8ed403c8f41dba695df196960a26820)
 

Author SHA1 Message Date
Alexander Gavrilov ec48405f0a Fix mistake: static initialization code cannot access other static objects.
Specifically, the eid->type() call depends on the order of linking.
2012-03-29 22:56:06 +04:00
Warmist 7d47208c65 Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-29 21:33:41 +03:00
Petr Mrázek 0c2c94fa92 Remove random bad asserts 2012-03-29 20:18:14 +02:00
Petr Mrázek 69b1bbe59e Turn sorting lambdas into functors in autolabor. 2012-03-29 20:00:26 +02:00
Petr Mrázek b847a026e3 Increment revision due to DERP. 2012-03-29 19:17:48 +02:00
Petr Mrázek adc0a6396d DERP: missed the readme. 2012-03-29 19:17:04 +02:00
Petr Mrázek 5f53388890 Track stonesense 2012-03-29 19:03:51 +02:00
Petr Mrázek 541e0ca205 Merge https://github.com/rh73/dfhack
Conflicts:
	plugins/changelayer.cpp
2012-03-29 18:42:45 +02:00
Petr Mrázek 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
Robert Heinrich 2446fb7abf Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-29 18:27:40 +02:00
Robert Heinrich a4995d7681 minor: return CR_WRONG_USAGE if user forgot to specify material and/or quality 2012-03-29 18:26:10 +02:00
Warmist ce69cdb5df New way of doing assignments used in tools/empregnate. 2012-03-29 18:39:11 +03:00
Robert Heinrich 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
Robert Heinrich e249ef1377 minor fix (forgot a line break in helpstring) 2012-03-29 17:14:41 +02:00
Robert Heinrich cc54d5dfa9 Merge branch 'master' of git://github.com/angavrilov/dfhack
Conflicts:
	library/xml
2012-03-29 16:12:54 +02:00
Robert Heinrich 4525bee58f Merge branch 'master' of git://github.com/ab9rf/dfhack
Conflicts:
	library/xml
2012-03-29 16:10:31 +02:00
Robert Heinrich 9b75373403 Merge branch 'master' of git://github.com/peterix/dfhack
Conflicts:
	library/xml
2012-03-29 16:03:12 +02:00
Robert Heinrich 88c914142b added plugin changeitem (change material type and base quality) 2012-03-29 15:33:54 +02:00
Alexander Gavrilov 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
Alexander Gavrilov 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
Alexander Gavrilov f6c6218909 Temporary tweak: patch in __pairs and __ipairs from 5.2 into lua 5.1. 2012-03-29 11:32:22 +04:00
Alexander Gavrilov 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
Kelly Martin e968e936c7 Merge remote-tracking branch 'origin/master' 2012-03-28 23:24:35 -05:00
Kelly Martin d9d1d34d5a track 2012-03-28 23:24:05 -05:00
Kelly Martin 453141920f Merge remote-tracking branch 'upstream/master' 2012-03-28 23:22:28 -05:00
Kelly Martin fea34bfdde autolabor: set reequip flag when appropriate. also tweaked scoring to reduce job clumping. 2012-03-28 21:57:08 -05:00
Kelly Martin 1a92f561fe autolabor: set reequip flag when appropriate 2012-03-28 21:56:23 -05:00
Petr Mrázek 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
Petr Mrázek 757ad3334c Track structures 2012-03-29 00:27:03 +02:00
Petr Mrázek 1f5c586f62 Merge https://github.com/rh73/dfhack 2012-03-28 20:16:14 +02:00
Petr Mrázek 6235d2e801 Merge https://github.com/angavrilov/dfhack 2012-03-28 19:53:10 +02:00
Petr Mrázek 6ea0d810bb Merge https://github.com/mikestewart/dfhack 2012-03-28 19:52:36 +02:00
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