Petr Mrázek
0e384ada75
Sync submodules
2013-02-05 05:34:34 +01:00
Petr Mrázek
12c5f9c779
Merge https://github.com/ab9rf/dfhack
2013-02-05 05:34:19 +01:00
Anuradha Dissanayake
dff16c3c1d
Define nullptr for gcc < 4.6
2013-02-02 02:24:05 +13:00
Anuradha Dissanayake
ecf255243f
Plugin to easily find and resume suspended constructions
2013-02-02 02:24:05 +13:00
Anuradha Dissanayake
056bde451a
Remove some leftover code
2013-01-29 21:22:17 +13:00
Anuradha Dissanayake
ae8bb7c9f8
Fix for gcc errors.
2013-01-29 20:44:56 +13:00
falconne
58125a57a7
Merge remote-tracking branch 'remotes/github/buildingplan'
2013-01-27 23:42:28 +13:00
Anuradha Dissanayake
6546af94ee
Clear persistent data after item assigned. Fix some material selection screen functionality.
2013-01-24 20:16:18 +13:00
Anuradha Dissanayake
f036360688
Add filters for quality, material and decorations.
2013-01-23 23:25:38 +13:00
Kelly Martin
675e92f350
Autolabor: add build floor grate labor, add unbuild screwpump labor, protect pump operators, do not clear labors on already busy dwarfs
2013-01-22 16:34:51 -06:00
Anuradha Dissanayake
62ee18ad06
Disable optimization in MSVC RelWithDebugInfo to make debugging easier.
2013-01-19 12:21:57 +13:00
Anuradha Dissanayake
35f4984b5f
Enable multi-processor compilation on MSVC
2013-01-19 11:05:41 +13:00
Anuradha Dissanayake
f5a0644b45
Fix bad refactor
2013-01-18 23:29:08 +13:00
Anuradha Dissanayake
192baa5638
Building plan plugin: place furniture before it's built. Initial checkin.
2013-01-18 23:28:45 +13:00
Alexander Gavrilov
1a3987bab3
Proper line breaks in the NEWS file.
2013-01-16 20:42:55 +04:00
Alexander Gavrilov
e1a2e6ece4
Block and grey out the trade screen actions when search is active.
...
After actually trying the search in game, it is obvious that
clearing search upon pressing the trade button is confusing,
because if you don't pay enough attention, it looks exactly
like as if the trade actually happened.
2013-01-16 20:42:41 +04:00
Alexander Gavrilov
597074498f
Fix various issues with updated search.
...
- Priority conflict with tweak military-stable-assign.
- The noble screen misbehaves if only one list item is left.
- Noble screen search string not reset after Enter/Esc.
2013-01-16 20:30:11 +04:00
Alexander Gavrilov
14d41b8eda
Update search to the newer structure definitions.
2013-01-16 18:55:05 +04:00
Alexander Gavrilov
309f162566
Fix line endings again.
2013-01-16 18:54:35 +04:00
Anuradha Dissanayake
ed0baa3f69
Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin.
2013-01-16 18:48:59 +04:00
Anuradha Dissanayake
4257c9fe84
Ignore vermin in animals screen search
2013-01-16 18:48:55 +04:00
Anuradha Dissanayake
8741983aaa
Fix for gcc errors. It seems calls to base class members in a templated class must be fully template qualified.
2013-01-16 18:48:49 +04:00
Alexander Gavrilov
655cd3602c
Merge remote-tracking branch 'falconne/search'
2013-01-16 18:30:29 +04:00
Petr Mrázek
940d5fe891
Merge https://github.com/expwnent/dfhack
2013-01-15 23:49:10 +01:00
Petr Mrázek
b9694958ce
Merge https://github.com/warmist/dfhack
2013-01-15 23:48:32 +01:00
Petr Mrázek
e06b6904f1
Small fix to sync dfhack with the structures.
2013-01-15 23:41:43 +01:00
Petr Mrázek
0073c1bec2
Track xml and stonesense
2013-01-15 23:16:15 +01:00
Kelly Martin
90a62a82f7
Autolabor: add screw pump build labor
2013-01-14 12:12:56 -06:00
expwnent
c031a7e081
Merge branch 'infiniteSky'
2013-01-13 15:28:31 -05:00
expwnent
44662de601
Infinite sky: bug with z level flags.
2013-01-13 15:28:17 -05:00
Warmist
99ec3d9841
gm-editor: Fixed bug with arrays with number indexes.
2013-01-13 22:07:10 +02:00
Anuradha Dissanayake
fdcb248ea0
Merge branch 'automaterial_box'
2013-01-12 23:39:50 +13:00
Anuradha Dissanayake
83ef94774b
A better format for toggle strings.
2013-01-12 23:32:30 +13:00
Quietust
7c1fb39ec0
No need for these to be separate variables
2013-01-09 10:19:43 -06:00
Quietust
3c6ddc2a8c
Merge branch 'master' of https://github.com/expwnent/dfhack
...
Conflicts:
NEWS
library/xml
2013-01-09 10:09:58 -06:00
expwnent
0b6858c7ff
Update news.
2013-01-07 12:36:11 -05:00
expwnent
476afafb3c
Merge branch 'autoSyndrome' into recent
2013-01-07 12:09:55 -05:00
expwnent
6fd9ce339d
Autosyndrome: fixed the rules on when syndromes apply.
2013-01-07 12:09:39 -05:00
Warmist
1990e2caf7
Small fix to adv site creation, now it's really centered around you
2013-01-07 02:01:59 +02:00
Kelly Martin
553a312266
Autolabor: add deconstruct bridge labor
2013-01-06 10:59:20 -06:00
Warmist
87d79b1119
advfort: is sand bearing fix for glass making, is corpse fix for butchering (todo dissasemble and see how it works really)
2013-01-06 18:58:58 +02:00
Anuradha Dissanayake
6d6d55a937
Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin.
2013-01-06 18:32:49 +13:00
Anuradha Dissanayake
140f78c8a0
Ignore vermin in animals screen search
2013-01-06 18:14:25 +13:00
Anuradha Dissanayake
0fa27d6c34
Fix for gcc errors. It seems calls to base class members in a templated class must be fully template qualified.
2013-01-06 14:59:39 +13:00
expwnent
3ffbef2396
Merge branch 'canStepBetween' into recent
2013-01-05 18:10:29 -05:00
expwnent
f8abd5c595
StepBetween: renamed stuff back to the way it was. Thought I had already done that.
2013-01-05 18:09:50 -05:00
expwnent
47b20ea301
Infinite sky: added glyphs and made it print status when no arguments given.
2013-01-05 17:32:23 -05:00
Kelly Martin
86c3c385bd
Autolabor: exclude hauling labors from clawback
2013-01-05 16:27:57 -06:00
expwnent
4d57a053fc
Infinite sky: added helpful print statements.
2013-01-05 16:51:29 -05:00
expwnent
151ff0f296
Infinite sky: rename from sky eternal.
2013-01-05 16:34:33 -05:00