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 |
|
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
|
4bef70ab6f
|
Merge branch 'search'
|
2013-01-06 02:27:57 +13: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 |
|
Warmist
|
4d731d0c28
|
advfort:
added buildings with width/height/direction (TODO better gui)
added farming (planting/harvesting)
added clean job
|
2013-01-05 01:41:44 +02:00 |
Kelly Martin
|
c92da70fbc
|
Merge branch 'master' into autolabor
|
2013-01-04 13:20:53 -06:00 |
|
Kelly Martin
|
7debd3d983
|
Autofarm: correct incorrect logic for determining if a farm is surface or subterranean
|
2013-01-04 13:20:28 -06:00 |
|
Kelly Martin
|
9404267c1f
|
Autolabor: Tell DF to immediately process jobs after each run.
|
2013-01-04 13:14:20 -06:00 |
|
expwnent
|
ec03d567d2
|
EventManager: use WORLD_LOADED instead of MAP_LOADED.
|
2013-01-03 22:47:27 -05:00 |
|
expwnent
|
715f191c26
|
EventManager: made the frequency part of EventHandler.
|
2013-01-03 19:31:29 -05:00 |
|
expwnent
|
9e74ae58f2
|
EventManager: Fixed a problem with deregistering event frequencies.
|
2013-01-03 19:07:05 -05:00 |
|
Warmist
|
8ffafd8a26
|
advfort:
reverted to old way of reseting the menu, added setup for race/civ/group ids and main.fortress_entity.
|
2013-01-04 00:48:24 +02:00 |
|
Warmist
|
179c7ae32a
|
advfort:
reset using df button.
|
2013-01-03 23:53:42 +02:00 |
|
Warmist
|
e3ca612ed5
|
many improvements to advfort:
fixed being able to engrave soft materials, started using ui_buttons for better workshop functionality, started working on manual item assignment
|
2013-01-03 23:21:57 +02: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 |
|
Kelly Martin
|
796e387398
|
Add a guard against an invalid item pointer, and don't try to deduce construction labor for item_lost jobs
|
2013-01-03 12:24:32 -06:00 |
|
Anuradha Dissanayake
|
7b561f108b
|
Fix hotkey detection
|
2013-01-03 22:01:01 +13:00 |
|
expwnent
|
123f34bf85
|
Ignore swap files.
|
2013-01-02 21:06:48 -05:00 |
|
expwnent
|
285ee3b399
|
True transformation: got rid of debug print statements.
|
2013-01-02 19:45:08 -05:00 |
|
expwnent
|
ec024c3b9f
|
Merge branch 'eventManager' into trueTransformation
|
2013-01-02 19:26:45 -05:00 |
|
expwnent
|
5865579b23
|
EventManager: got rid of print statement.
|
2013-01-02 19:26:37 -05:00 |
|
expwnent
|
a8b0a7e695
|
EventManager: got rid of silly print statement.
|
2013-01-02 19:25:24 -05:00 |
|
expwnent
|
8c4e63e0cd
|
Merge branch 'eventManager' into trueTransformation
|
2013-01-02 19:24:14 -05:00 |
|
expwnent
|
6d2773856a
|
EventManager: fixed a few things.
|
2013-01-02 19:23:40 -05:00 |
|
expwnent
|
d4afa4b6e4
|
True Transformation: turn into something temporarily, then permanently transform into another creature. If you try to do that with a syndrome, you can't do it recursively.
|
2013-01-02 19:21:25 -05:00 |
|
expwnent
|
0f2b9a3524
|
Merge branch 'trueTransformation' into trueTransformation2
|
2013-01-02 18:31:15 -05:00 |
|
expwnent
|
4e4e382b8f
|
EventManager: added syndrome event.
|
2013-01-02 18:30:15 -05:00 |
|
expwnent
|
03650dbdbd
|
True transformation. Temp commit.
|
2013-01-02 17:32:11 -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
|
f680ef7ee3
|
Made git ignore vim swap files.
|
2013-01-02 11:30:06 -05:00 |