Commit Graph

6284 Commits (1ea2da511b36760644b901d020a8c48163bf9a84)
 

Author SHA1 Message Date
expwnent 0fbc7e22ee Merge remote-tracking branch 'lethosor/patch-4' 2014-09-16 17:21:39 -04:00
expwnent 040acd166b Merge remote-tracking branch 'eswald/automelt'
Conflicts:
	dfhack.init-example
2014-09-16 17:20:50 -04:00
expwnent 5650405b55 Update NEWS. 2014-09-16 17:19:06 -04:00
expwnent 2cd7b5b983 Merge branch 'expand-dfhack.init-example' of https://github.com/PeridexisErrant/dfhack 2014-09-16 17:15:33 -04:00
expwnent f114aee758 Merge branch 'fix-exportlegends' of https://github.com/PeridexisErrant/dfhack 2014-09-16 17:13:51 -04:00
expwnent b801870b47 Update NEWS. 2014-09-16 17:12:49 -04:00
expwnent a225984bc5 Merge remote-tracking branch 'eswald/hotkeys' 2014-09-16 17:11:15 -04:00
expwnent 9716b30eac Update NEWS. 2014-09-16 17:09:43 -04:00
expwnent d425c2edf9 Merge remote-tracking branch 'lethosor/lua-printall-ipairs' 2014-09-16 17:08:45 -04:00
expwnent 5a1d88307f Merge remote-tracking branch 'eswald/stockpile-iterator' 2014-09-16 17:05:02 -04:00
expwnent 05e6389a75 Update NEWS. 2014-09-16 17:03:05 -04:00
expwnent 39bfe71453 Merge remote-tracking branch 'putnam/patch-3' 2014-09-16 16:55:48 -04:00
expwnent 3e882f35b3 Merge remote-tracking branch 'lethosor/global-onload' 2014-09-16 16:53:31 -04:00
expwnent d223655dc7 Bump version to 0.40.12-r1. 2014-09-16 16:53:19 -04:00
expwnent 8508dd6f04 Update xml. 2014-09-16 16:51:48 -04:00
lethosor 328b95c1ec Merge remote-tracking branch 'origin/develop' into global-onload 2014-09-14 11:56:07 -04:00
Lethosor d21cd54648 Add '@' documentation to dfhack.lua 2014-09-14 11:50:03 -04:00
Lethosor 1ea1b50790 job_material_category -> dfhack_material_category
Fixes #330 - submitted by @finndibaenn
2014-09-14 11:13:26 -04:00
lethosor 991fb3cea2 Change search key from 's' to 'q' on unit/job lists
Avoids a conflict with the "suspend job" option (added in 0.40.12)
2014-09-10 16:59:09 -04:00
Lethosor 9d3af4dcb6 Close file opened in load_patch() on success
Fixes #327
2014-09-10 15:09:57 -04:00
Eric Wald e76b8c4b6b Merging automelt hotkey into autotrade line when links intrude.
The new interface looks significantly different, but only when there are too many stockpile links to show the lines in their usual places.
The difference between bright green and grey should be obvious most of the time, right?
2014-09-09 21:08:38 -06:00
Eric Wald 8bc2f02aee Moving the automelt hotkey next to autotrade. 2014-09-09 20:51:58 -06:00
lethosor 20df0511a1 Update NEWS
Add unlisted changes in 0.40.11-r1

Also include NEWS in installation directory
2014-09-09 22:51:44 -04:00
Eric Wald 60d126379a Automelt documentation updates. 2014-09-09 20:36:48 -06:00
Anuradha Dissanayake 757491f112 Add automelt plugin 2014-09-09 20:31:55 -06:00
PeridexisErrant a13640f43c enable UI plugins, add keybindings
The UI plugins are one of the major reasons for most players to use
dfhack, so they should be enabled by default.   The other additions seem
to be semi-standard keybindings for those functions
(http://redd.it/2fuaaf)
2014-09-09 17:55:33 +10:00
PeridexisErrant af79ae44c9 update exportlegends for DF40.x
Better code and also exports the new maps.  Extending to also export
site maps would be cool eventually.
2014-09-09 17:47:26 +10:00
Eric Wald cf04246961 Documentation updates for the hotkeys plugin. 2014-09-08 23:04:56 -06:00
Anuradha Dissanayake 07de1ce3f6 Add hotkeys plugin 2014-09-08 22:42:04 -06:00
lethosor fadca0aef2 Add a variant of printall() that uses ipairs 2014-09-08 20:30:22 -04:00
Putnam3145 a30780420b Removed hackwish crash.
It's mostly a user error issue, but it is certainly not one that's hard to come across.
2014-09-08 17:00:49 -07:00
expwnent c4d6c384ae Update NEWS. 2014-09-08 16:12:51 -04:00
lethosor 34d4537a11 Support for global onLoadWorld.init/onUnloadWorld.init scripts 2014-09-08 15:52:17 -04:00
expwnent c746d2a182 Update xml. 2014-09-08 15:46:25 -04:00
expwnent 248e4d837b Update xml. 2014-09-08 13:32:34 -04:00
expwnent 4800794ba6 Merge remote-tracking branch 'dfhack/develop' 2014-09-08 13:23:28 -04:00
expwnent ce929a89f4 Merge pull request #317 from hobotron-df/teleport-docs
Adding usage documentation for teleport.lua
2014-09-08 13:21:47 -04:00
expwnent 38ec093487 Merge pull request #300 from eswald/docs
Documentation updates
2014-09-08 13:15:39 -04:00
expwnent f5039b37b8 Merge remote-tracking branch 'lethosor/osx-plug-dylib'
Conflicts:
	NEWS
2014-09-08 13:14:28 -04:00
expwnent 36a6e26e2f Merge pull request #319 from eswald/releasing
Linux Release Improvements: package format.
2014-09-08 13:13:45 -04:00
expwnent 5152e1f13e Merge pull request #316 from eswald/trade-search
Removing new trade hotkeys while a counteroffer is displayed.
2014-09-08 13:12:31 -04:00
expwnent 181bd97e22 Merge pull request #311 from hobotron-df/deathcause-fix
Fix: Issue 291: bow_item_(sub)type is now shooter_item_(sub)type
2014-09-08 13:03:52 -04:00
expwnent 52d0f1c3f6 Merge remote-tracking branch 'lethosor/autotrade-usage-newline' 2014-09-08 13:00:11 -04:00
expwnent 8bd1a23b2c Update NEWS. 2014-09-08 12:53:30 -04:00
expwnent 704c63fe56 Merge commit 'baeb894' 2014-09-08 12:52:21 -04:00
Eric Wald 0f311a7606 Removing dead duplicate code. 2014-09-07 15:11:11 -06:00
Eric Wald 83b1317173 Switching stockflow to the internal getStockpileContents.
This should speed it up over checking each space individually, but no longer counts spaces with empty assigned bins and barrels as empty.
2014-09-07 15:07:57 -06:00
Eric Wald 1ce07c063d Canonical way to find the stockpile by id. 2014-09-07 14:55:34 -06:00
Eric Wald 74e709ec19 Adding getStockpileContents to the Lua API. 2014-09-07 14:52:08 -06:00
Eric Wald 8631da7e4e Convenience method to collect a vector from StockpileIterator. 2014-09-07 14:10:27 -06:00