Commit Graph

5466 Commits (f47565465ef937ad439e66a5c1224e6f517413c6)
 

Author SHA1 Message Date
expwnent 0f5efb47ae Update to 0.40.15. 2014-11-09 01:30:43 -05:00
expwnent 1b0a2ecb8a Merge remote-tracking branch 'eswald/tradescreen' into develop
Conflicts:
	NEWS
2014-11-09 00:42:50 -05:00
expwnent 7549169cd2 Merge remote-tracking branch 'dfhack/develop' into develop 2014-11-09 00:39:40 -05:00
expwnent c9cf94128e Merge pull request #376 from lethosor/mousequery-z-level-fix
Fix selection behavior of mousequery on lowest z-level
2014-11-09 00:37:46 -05:00
expwnent f6a281ebc7 Merge pull request #379 from Putnam3145/teleport-update
Updated teleport for new args system.
2014-11-09 00:35:33 -05:00
expwnent 6167f37e13 Merge pull request #380 from lethosor/update-export-dt-ini
Update export-dt-ini.lua
2014-11-09 00:35:04 -05:00
expwnent 267d0837ad Merge pull request #381 from lethosor/update-cmakelists
Re-enable rendermax in CMakeLists.txt
2014-11-09 00:34:23 -05:00
expwnent 7929d44030 Merge pull request #382 from PeridexisErrant/autolabor-fixes
Autolabor fixes
2014-11-09 00:33:46 -05:00
expwnent 8e492b1669 Merge pull request #384 from lethosor/dwarfmonitor-0.40.14+
Make dwarfmonitor compile for 0.40.14+
2014-11-09 00:33:14 -05:00
expwnent c154404a89 Merge pull request #385 from lethosor/automaterial-cursor
Fix automaterial/box-select cursor color
2014-11-09 00:32:32 -05:00
lethosor f069676fc2 Fix automaterial/box-select cursor color
Only use a dark green cursor when actually building a construction
2014-11-08 19:05:45 -05:00
PeridexisErrant 994e98c5c1 Use name of now-identified field
Ready for DFHack 40.15-r1 and later
2014-11-09 09:18:53 +11:00
lethosor 2484f89542 Update dwarfmonitor's happiness display 2014-11-08 15:08:56 -05:00
lethosor 04ceb64bad Merge remote-tracking branch 'origin/develop' into mousequery-z-level-fix
Conflicts:
	NEWS
2014-11-08 14:36:20 -05:00
PeridexisErrant 195ccf4bc8 Fix beekeeping, enable help message
Plugins should now be enabled with "enable autolabor".  The beekeeping
bug was fixed in DF0.40.07, so autolabor can set multiple beekeepers
again.
2014-11-08 11:45:20 +11:00
PeridexisErrant 9b94f56f7d Expanded autolabor documentation
Because "see help function" isn't actually documentation.  Information
pulled from help function and explanations in code.
2014-11-08 11:43:48 +11:00
Lethosor ec580cdfa5 Re-enable rendermax in CMakeLists.txt 2014-11-07 16:43:50 -05:00
Lethosor ae001c60ad Update export-dt-ini.lua
From https://github.com/splintermind/Dwarf-Therapist/blob/DF2014/export-dt-ini.lua
2014-11-07 16:40:53 -05:00
Lethosor 174e85dd16 Update NEWS 2014-11-07 15:39:24 -05:00
expwnent fa401f8637 EventManager tweak. 2014-11-07 14:16:10 -05:00
expwnent 82dade1ae0 interaction-trigger documentation tweak. 2014-11-07 14:14:49 -05:00
Putnam3145 6b2b13b186 Updated teleport for new args system.
Also updated the teleport function to properly check for units at
destination.
2014-11-06 22:15:21 -08:00
Eric Wald 8ac9748700 Switching fast-trade Shift-Up to move before marking
This makes it undo Shift-Down, instead of mirroring it, which works much better when you've gone too far down the list.
2014-11-06 23:06:17 -07:00
Eric Wald 308e95defe Documenting autotrade
It's similar enough to automelt to share a section, right?
2014-11-06 22:41:16 -07:00
Eric Wald ea5fff7903 NEWS reports for trade screen issues 2014-11-06 22:28:13 -07:00
Eric Wald 46ebeaa722 Adding Shift-Up to the fast-trade tweak. 2014-11-06 22:22:02 -07:00
Eric Wald 7fb82131c7 Switching fast-trade from Shift-Enter to Shift-Down
Technically, from SELECT_ALL to CURSOR_DOWN_FAST, to avoid blocking the new native Select All functionality.
As a bonus, the new key repeats as you hold it down.
2014-11-06 22:14:00 -07:00
Eric Wald 777b2f6416 Moving trade screen search options to match the new column size 2014-11-06 22:05:05 -07:00
Eric Wald db7bc8c5c8 Removing autotrade's version reporting.
It's built with DFHack itself now, so the global version is more accurate than the plugin-specific version, which hasn't been consistently getting incremented.
2014-11-06 21:53:00 -07:00
expwnent ba56f369e5 Update NEWS. 2014-11-06 23:47:38 -05:00
Eric Wald 2ebc318daa Removing autotrade's obsolete Mark All 2014-11-06 21:47:14 -07:00
expwnent e4d4f7230b modtools/item-trigger: fix equip/unequip bug and correct minor documentation error 2014-11-06 23:46:10 -05:00
expwnent dcdb6aae1b EventManager: properly deal with frame_counter getting reset. 2014-11-06 23:44:13 -05:00
expwnent 63c733d0b5 Merge remote-tracking branch 'dfhack/develop' into develop 2014-11-05 21:31:50 -05:00
expwnent d35e422511 Update NEWS and CMakeLists for release. 2014-11-05 21:30:31 -05:00
expwnent e9e8b83656 Update stonesense. 2014-11-05 20:57:57 -05:00
expwnent 272aa5dc50 Merge pull request #374 from lethosor/0.40.14-update-news
Update NEWS
2014-11-02 13:30:43 -05:00
Lethosor f818dd3897 Update NEWS
This covers commits from 0.40.13-r1 to b81346
2014-11-02 12:39:01 -05:00
expwnent b81346fa21 Merge pull request #349 from lethosor/tweak-reorganization
'tweak' plugin cleanup/reorganization, new tweaks
2014-11-02 12:24:41 -05:00
lethosor 5232bffb53 farm-plot-select: Actually check for crop validity 2014-11-02 12:21:51 -05:00
expwnent 29d6bba669 Fix trackstop ambiguity complaints, update df-structures. 2014-11-02 11:55:01 -05:00
lethosor 14b947837c Merge remote-tracking branch 'origin/develop' into tweak-reorganization
Conflicts:
	NEWS
	Readme.html
	plugins/tweak/tweak.cpp
2014-11-02 11:40:53 -05:00
expwnent ad96ba74ea Merge remote-tracking branch 'dfhack/develop' into develop 2014-11-02 04:14:48 -05:00
expwnent 21a7546556 Add stocks, autochop to dfhack.init-example enable (PeridexisErrant) 2014-11-02 04:09:46 -05:00
expwnent 84c7910628 Merge pull request #339 from PeridexisErrant/document-seedwatch
properly documented the seedwatch plugin
2014-11-02 04:08:12 -05:00
expwnent 4e0ad256a5 Update XML. 2014-11-02 04:06:51 -05:00
expwnent 87443035a9 Merge remote-tracking branch 'quietust/develop' into develop
Conflicts:
	plugins/manipulator.cpp
2014-11-02 04:05:51 -05:00
expwnent 4ccfb07a54 Merge pull request #350 from hobotron-df/fastdwarf-attack-speed
Fixes for fastdwarf combat speed and attack retargeting.
2014-11-02 03:37:55 -05:00
expwnent bfac2b97cc Merge pull request #352 from eswald/trackstop
New trackstop plugin
2014-11-02 03:34:22 -05:00
expwnent 82fb533176 Merge pull request #353 from eswald/autotrade-bugfix
Autotrade bugfix: Mark All now unmarks bin contents.
2014-11-02 03:33:28 -05:00