Commit Graph

8655 Commits (c75a4fe8eebd3f8ef6b57f094e4c56c29f70eb9e)
 

Author SHA1 Message Date
Petr Mrázek d766baa49b Merge https://github.com/warmist/dfhack 2012-05-19 18:27:21 +02:00
Alexander Gavrilov 7774f5f2c1 Add a mechanism converting ui focus to a string representation.
The idea is to make ui handling more modular, dispensing with
huge functions that switch or if/else on lots of variables.
For now, used to split up functions in the sort plugin.
2012-05-19 19:50:36 +04:00
jj a59825ff80 linux: remove LD_PRELOAD warning on x86_64 distrib 2012-05-19 13:02:11 +02:00
jj b851ee2d22 Merge branch 'master' of git://github.com/peterix/dfhack 2012-05-19 12:53:23 +02:00
Quietust a47c2ecbda Merge branch 'master' of git://github.com/peterix/dfhack 2012-05-18 22:21:55 -05:00
Warmist 2beaed4fd8 Added moveToBuilding to api docs and made a script using it (puts item on table) 2012-05-18 18:46:08 +03:00
Petr Mrázek e2f39368b1 Sync submodules 2012-05-18 17:43:22 +02:00
Petr Mrázek 1333dc569f Merge https://github.com/Caldfir/dfhack 2012-05-18 17:42:34 +02:00
Petr Mrázek ed6da7618a Merge https://github.com/warmist/dfhack 2012-05-18 17:41:09 +02:00
Alexander Gavrilov 4aa6dbdd00 Support sorting items in the trade screens.
Caveat: sorts items in containers independently from the container.
2012-05-18 19:18:49 +04:00
Alexander Gavrilov 3c44e22760 Support trade viewscreens in Items::getSelectedItem. 2012-05-18 17:54:05 +04:00
Kelly Martin 51ad697bf5 Fix unresolved symbol reference in Windows platform. 2012-05-18 08:25:25 -05:00
Warmist 48185568e9 Added df::Items::moveToBuilding. Moved item from ground to building, usefull for museum forts (placing items on tables) 2012-05-18 16:05:29 +03:00
Kelly Martin 3f542b4df1 Update merge 2012-05-18 07:40:05 -05:00
Kelly Martin 6adb78ee0c Merge remote-tracking branch 'angavrilov/master' 2012-05-18 07:38:23 -05:00
Alexander Gavrilov 52426f9035 Track xml 2012-05-17 20:41:41 +04:00
Alexander Gavrilov f37f708b37 Add a workaround for Planepacked bug in buildings constructed via API.
Buildings hanging in the air cause constructWithFilters to
exhibit the same behavior as a moody dwarf in a burrow excluding
the workshop, i.e. endlessly collecting the same type of reagent.

http://www.bay12games.com/dwarves/mantisbt/view.php?id=1416

The workaround monitors jobs and reclassifies the reagents on the fly.
2012-05-17 20:38:27 +04:00
Alexander Gavrilov e9ef9b87b5 Add central locations for onUpdate and onStateChange handling in core. 2012-05-17 20:04:09 +04:00
Alexander Gavrilov 2c0024adc9 Make Items::getPosition exactly match the DF original in behavior. 2012-05-17 19:56:55 +04:00
Alexander Gavrilov efdb709284 Support creating rollers and stops with dfhack.buildings.constructBuilding. 2012-05-17 00:19:29 +04:00
Kelly Martin cba3f8d61d Track xml 2012-05-16 11:28:21 -05:00
Alexander Gavrilov 68c5d9b86c Stop Shift-Enter from being handled as if it was Shift-M. 2012-05-16 18:10:07 +04:00
Alexander Gavrilov 8185eec95c Add two more development related lua scripts. 2012-05-16 17:46:44 +04:00
Alexander Gavrilov dbd39af58a Support testing and modifying pending timeout callbacks. 2012-05-16 17:06:08 +04:00
Kelly Martin e77c9dc730 Add new PUSH_HAUL_VEHICLES labor to autolabor.
This commit will only work with 0.34.08 (or later).
2012-05-15 13:42:48 -05:00
Quietust 2cc18157db Merge branch 'master' of https://github.com/peterix/dfhack 2012-05-15 07:58:39 -05:00
playfordh 0d2849ca5a Modified autodump to enable extraction of equipped items from unit inventory
Signed-off-by: playfordh <harlanplayford@gmail.com>
2012-05-15 06:32:09 -04:00
harlanplayford 689cf3ee51 Added ForceEquip plugin to project
Signed-off-by: playfordh <harlanplayford@gmail.com>
2012-05-15 06:03:29 -04:00
harlanplayford 27ca317871 Added new method - Items::moveToInventory(...)
Signed-off-by: playfordh <harlanplayford@gmail.com>
2012-05-15 06:01:59 -04:00
Kelly Martin 27cc2dc92c Add dwarf state table entries for the new jobs from .34.7 and .34.8. Also add a warning message for a dwarf who is doing an unknown job (instead of just reading random nonsense from off the end of the dwarf_states array).
This code is backward-compatible (the extra job entries will simply be unused in pre-.8).
2012-05-14 21:54:11 -05:00
Kelly Martin d4f9806568 Track library 2012-05-14 17:30:21 -05:00
Kelly Martin e078c75737 Track submodules 2012-05-14 13:44:03 -05:00
Kelly Martin fabc6d95e6 Merge remote-tracking branch 'angavrilov/master' 2012-05-14 07:09:54 -05:00
Alexander Gavrilov 642a625586 Support custom buildings in dfhack.buildings.getFiltersByType.
Also document it and constructBuilding in Lua API docs.
2012-05-13 18:39:00 +04:00
Alexander Gavrilov 87ec1de891 Improve lua api for tile biome access. 2012-05-13 13:58:41 +04:00
Kelly Martin 86dc2d9855 Merge remote-tracking branch 'angavrilov/master'
Conflicts:
	library/xml
2012-05-12 19:49:27 -05:00
Kelly Martin bd2b55c490 Merge remote-tracking branch 'upstream/master' 2012-05-12 19:43:02 -05:00
jj 2629db5ed1 ruby: add building creation code 2012-05-13 01:40:44 +02:00
jj ea6e207290 Merge upstream 2012-05-12 23:52:13 +02:00
jj 3da787c5c9 Merge upstream 2012-05-12 23:51:49 +02:00
Alexander Gavrilov c6b52067bd Request designation rescan in auto-growing burrows.
This improves performance of burrowed miners digging 1-wide tunnels.
2012-05-12 20:54:26 +04:00
Kelly Martin ccbae58365 Set default beekeeper max to 1 in autolabor (see http://www.bay12games.com/dwarves/mantisbt/view.php?id=3981) 2012-05-12 11:21:12 -05:00
Alexander Gavrilov 60bb486aba Add api for enabling liquid and temperature updates for blocks.
Now updates also have to be enabled for the z level to work.
2012-05-12 20:12:09 +04:00
Alexander Gavrilov af3e389093 Update submodules. 2012-05-12 18:50:22 +04:00
Petr Mrázek 92f069e209 Brush output lists numbers, update xml. 2012-05-11 07:00:18 +02:00
Jared Adams f3ca3addbf Merge remote-tracking branch 'upstream/master' 2012-05-10 22:06:43 -06:00
jj dfe86f9bd7 ruby: interpret types in vmethod signatures 2012-05-11 01:34:03 +02:00
jj 607cd9c8f2 ruby: tweak enums 2012-05-10 23:41:50 +02:00
jj d30573a0e0 probe: fix gcc warning 2012-05-10 22:57:11 +02:00
jj 987cf697db Merge upstream 2012-05-09 15:44:32 +02:00