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
expwnent
4c2dfdf772
Dig smart: dig out minerals as you discover them. Very rough draft.
2013-01-09 15:15:11 -05: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
expwnent
4920293c2d
Infinite sky: get it to compile.
2013-01-05 16:30:48 -05:00
expwnent
471e82a88a
Merge branch 'skyEternal' into infiniteSky
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 16:18:01 -05:00
expwnent
8be68390b3
Merge branch 'autoSyndrome' into recent
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 14:08:14 -05:00
expwnent
e81f9733c8
Merge branch 'trueTransformation' into recent
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 14:07:35 -05:00
expwnent
9246ac9b05
Merge branch 'workNow' into recent
2013-01-05 13:36:24 -05:00
expwnent
cf3ac48518
Merge in autoSyndrome, trueTransformation, ...
2013-01-05 13:35:49 -05:00
expwnent
6622e9e06f
Merge branch 'canStepBetween' into recent
...
Conflicts:
library/modules/Maps.cpp
2013-01-05 13:32:29 -05:00
expwnent
a279f7e820
Merge branch 'eventManager' into recent
2013-01-05 13:31:12 -05:00
expwnent
9eafc7443d
Update submodules.
2013-01-05 13:15:10 -05:00
Warmist
838e13a80e
Make monarch script, for changing who is king/queen
2013-01-05 20:06:22 +02:00
expwnent
e1ad933068
True transformation: make it compile.
2013-01-05 12:58:06 -05:00
expwnent
7a33e5bdbe
Merge branch 'eventManager' into trueTransformation
2013-01-05 12:51:14 -05:00
expwnent
5fc466ef7e
Work now: also update dig on pause.
2013-01-05 12:50:44 -05:00
expwnent
d2a2a63d01
Merge branch 'recent' into workNow
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 12:45:34 -05:00
expwnent
874dfbdc4f
Merge branch 'eventManager' into autoSyndrome
2013-01-05 11:40:55 -05:00