3021fa47db
Merge remote-tracking branches 'jjyg/develop', 'putnam/patch-4' and 'eswald/blank-histories' into develop
...
Conflicts:
NEWS
2014-11-15 15:07:20 -05:00
8042c5d342
ruby: load arch-specific ruby-autogen
2014-11-14 12:49:08 +01:00
696380e749
ruby: distinguish ruby-autogen.rb name based on architecture
2014-11-14 12:47:42 +01:00
e2229f6a6a
ruby: remove DL_RUBY cmake option
2014-11-14 12:38:24 +01:00
be1d411b83
Add missing <functional> include for std::greater
2014-11-09 11:19:51 +01:00
1b0a2ecb8a
Merge remote-tracking branch 'eswald/tradescreen' into develop
...
Conflicts:
NEWS
2014-11-09 00:42:50 -05:00
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
267d0837ad
Merge pull request #381 from lethosor/update-cmakelists
...
Re-enable rendermax in CMakeLists.txt
2014-11-09 00:34:23 -05:00
7929d44030
Merge pull request #382 from PeridexisErrant/autolabor-fixes
...
Autolabor fixes
2014-11-09 00:33:46 -05:00
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
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
2484f89542
Update dwarfmonitor's happiness display
2014-11-08 15:08:56 -05:00
04ceb64bad
Merge remote-tracking branch 'origin/develop' into mousequery-z-level-fix
...
Conflicts:
NEWS
2014-11-08 14:36:20 -05:00
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
ec580cdfa5
Re-enable rendermax in CMakeLists.txt
2014-11-07 16:43:50 -05:00
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
46ebeaa722
Adding Shift-Up to the fast-trade tweak.
2014-11-06 22:22:02 -07:00
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
777b2f6416
Moving trade screen search options to match the new column size
2014-11-06 22:05:05 -07:00
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
2ebc318daa
Removing autotrade's obsolete Mark All
2014-11-06 21:47:14 -07:00
e9e8b83656
Update stonesense.
2014-11-05 20:57:57 -05:00
b81346fa21
Merge pull request #349 from lethosor/tweak-reorganization
...
'tweak' plugin cleanup/reorganization, new tweaks
2014-11-02 12:24:41 -05:00
5232bffb53
farm-plot-select: Actually check for crop validity
2014-11-02 12:21:51 -05:00
29d6bba669
Fix trackstop ambiguity complaints, update df-structures.
2014-11-02 11:55:01 -05:00
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
87443035a9
Merge remote-tracking branch 'quietust/develop' into develop
...
Conflicts:
plugins/manipulator.cpp
2014-11-02 04:05:51 -05:00
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
bfac2b97cc
Merge pull request #352 from eswald/trackstop
...
New trackstop plugin
2014-11-02 03:34:22 -05:00
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
6c356b5ae9
Merge pull request #359 from lethosor/embark-tools-oo-pr
...
embark-tools cleanup
2014-11-02 03:30:38 -05:00
0fa2cab5ac
Merge pull request #360 from eswald/automelt
...
Faster automelt
2014-11-02 03:29:01 -05:00
0fd15cc1e4
Merge pull request #365 from eswald/stable-sorting
...
Stable sorting for Dwarf Manipulator
2014-11-02 03:26:14 -05:00
49939ccb9c
Merge pull request #369 from warmist/fix-rendermax
...
Update rendermax
2014-11-02 03:25:04 -05:00
bad923130c
Manipulator - remove minimum width for Labors column, since it triggered the "should never happen" case upon extending the first column from 4 to 6
2014-11-01 11:24:05 -05:00
7c92f4abaa
Seems I misread the code from 0.34.11 - it switches against rand(2), not rand(3)
2014-10-31 13:47:04 -05:00
f08a32f4e2
Update Manipulator to display stress level instead of happiness
2014-10-31 13:33:35 -05:00
ed225de365
Update strangemood to check stress level for fell/macabre moods
2014-10-31 13:33:18 -05:00
f683395cae
Comment out more of military-training tweak, which no longer compiles
2014-10-31 13:33:04 -05:00
d05f249619
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-10-31 13:32:49 -05:00
72654e602a
Merge pull request #355 from lethosor/patch-6
...
Update digFlood documentation to mention onLoad(World).init
2014-10-31 11:48:04 -04:00
04ec2c9932
Update version to v0.40.14 and hack things so they compile.
...
Also make the find-offsets script less likely to crash if the
unit structure is misaligned and add more integrity checks.
2014-10-26 16:40:39 +03:00
ac73c0eeba
Allowing non-labor skills to sort stably.
2014-10-21 22:49:50 -06:00
169da1342d
Switching Dwarf Manipulator to a stable sort.
...
This means, for example, that when you sort by one skill, then by a second, dwarves with the first skill but not the second will still be grouped together.
2014-10-21 22:43:56 -06:00
f3626c1004
embark-tools cleanup
...
Fix #358 : Disable "s" keybinding for settings on notes screen
2014-10-12 13:35:20 -04:00
0fd3f3dbf4
Update digFlood documentation to mention onLoad(World).init
...
Per http://www.bay12forums.com/smf/index.php?topic=139553.msg5712785#msg5712785
2014-10-05 23:14:25 -04:00
95dd009a15
Restoring automelt for items in bins.
...
The stockpile iterator yields bins, but not their contents. Should other containers be checked, too?
2014-10-05 17:57:57 -06:00
aafa3a5f91
Expanding on the rollers menu.
...
As requested by fricy.
2014-10-02 22:00:40 -06:00
d2fb51f99e
New tweak: nestbox-color
2014-10-01 20:14:41 -04:00
2e80c6053c
Autotrade bugfix: Mark All now unmarks bin contents.
...
This prevents a form of cheating, because they already get traded with the bin itself, so their value had been counted twice.
However, the search plugin still enables this kind of cheating...
2014-09-29 21:37:05 -06:00
expwnent
Yoann Guillot
Alexander "Ace" Olofsson
expwnent
lethosor
PeridexisErrant
Lethosor
Eric Wald
Quietust
Alexander Gavrilov