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
|
0073c1bec2
|
Track xml and stonesense
|
2013-01-15 23:16:15 +01: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 |
Quietust
|
3c6ddc2a8c
|
Merge branch 'master' of https://github.com/expwnent/dfhack
Conflicts:
NEWS
library/xml
|
2013-01-09 10:09:58 -06: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 |
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 |
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
|
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
|
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 |
expwnent
|
bc5cdf8877
|
Auto syndrome: got rid of allow multiple syndromes option that didn't make any sense, and made sure that if allowing multiple targets it doesn't attach the syndrome to the worker twice.
|
2013-01-05 11:37:56 -05:00 |
Anuradha Dissanayake
|
91ee8ac020
|
Refactor search to handle more types of screens cleanly.
Added search to screens:
* Animals
* Military positions assignment
* Announcements
* Room list
* Job list
* Burrow assignment
|
2013-01-06 00:26:16 +13:00 |
expwnent
|
715f191c26
|
EventManager: made the frequency part of EventHandler.
|
2013-01-03 19:31:29 -05:00 |
expwnent
|
910e398a7b
|
EventManager: added invasion event.
|
2013-01-03 15:52:56 -05:00 |
Warmist
|
c22c4d009c
|
Added convenience functions to eventful (see Lua API.rst)
|
2013-01-03 20:30:51 +02:00 |
expwnent
|
4e4e382b8f
|
EventManager: added syndrome event.
|
2013-01-02 18:30:15 -05:00 |
Warmist
|
8b5e847dfa
|
New event for eventful. postWorkshopFillSidebarMenu for tweaking the sidebar menu on workshops.
|
2013-01-02 23:43:38 +02:00 |
expwnent
|
38ef75418a
|
AutoSyndrome: added an option to delete boiling rocks as they are created (on by default).
|
2013-01-02 14:09:16 -05:00 |
expwnent
|
5e2877be23
|
AutoSyndrome: added options for worker only (vs all in building), allow multiple targets, and allow multiple syndromes.
|
2013-01-02 13:47:59 -05:00 |
expwnent
|
bf0f0e910b
|
Merge branch 'eventManager' into autoSyndrome
|
2013-01-02 12:40:20 -05:00 |
expwnent
|
c3b2ae2137
|
EventManager: allowed plugins to specify how often they need events to be checked, in the event that monitoring is necessary.
|
2013-01-02 11:07:56 -05:00 |
expwnent
|
fa78d6ccfc
|
Merge branch 'recent' into eventManager-unstable
Conflicts:
library/modules/Job.cpp
|
2013-01-02 03:16:45 -05:00 |
expwnent
|
b320fb25f3
|
AutoSyndrome: added smart arguments for location, worker id, and reaction id.
|
2013-01-02 00:07:23 -05:00 |
expwnent
|
0572e87d7b
|
SkyEternal: allocates new z-levels of sky as needed, or on request.
|
2012-12-31 13:57:59 -05:00 |
Warmist
|
e4f4943b10
|
Merge branch 'master' of https://github.com/angavrilov/dfhack
|
2012-12-23 12:34:05 +02:00 |
expwnent
|
a4dc79565a
|
AutoSyndrome: allowed for triggering DFHack commands from in game reactions.
|
2012-12-22 00:13:07 -05:00 |
Warmist
|
786149a630
|
Added new event to eventful: onWorkshopFillSidebarMenu
|
2012-12-21 00:42:15 +02:00 |
expwnent
|
7972902c81
|
stepBetween: named a few things better, and fixed a lot.
|
2012-12-19 20:30:37 -05:00 |
expwnent
|
555c754636
|
EventManager: added construction and building events.
|
2012-12-18 18:34:38 -05:00 |
expwnent
|
01e5e93825
|
Renamed Maps::canWalkBetween to Maps::canPathBetween and added Maps::canWalkBetween, which does what it says.
|
2012-12-16 23:26:50 -05:00 |
expwnent
|
75db99a3c7
|
autoSyndrome: deleted an unused constant.
|
2012-12-15 18:52:05 -05:00 |
expwnent
|
3e5537e321
|
autoSyndrome: made it use EventManager.
|
2012-12-15 18:47:51 -05:00 |
expwnent
|
dae162a0b4
|
Merge branch 'eventManager' into autoSyndrome
|
2012-12-15 18:18:59 -05:00 |
expwnent
|
935058f0a5
|
EventManager: moved files around, made eventExample not run by default, and got rid of the silly NONE event type.
|
2012-12-15 17:43:41 -05:00 |
expwnent
|
86e002f3ff
|
EventManager: added item creation event.
|
2012-12-15 16:49:13 -05:00 |
expwnent
|
b0314755e0
|
EventManager: added unit death event.
|
2012-12-15 14:40:11 -05:00 |
Warmist
|
4af6b728b7
|
Small fix to gm-editor. Added proj_itemst and proj_unitst to eventful. Now you can make custom projectiles (e.g. rockets?)
|
2012-12-15 13:27:16 +02:00 |