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
|
2ca943ae20
|
Digging invaders: comment out debug print statements.
|
2013-01-04 00:43:39 -05:00 |
expwnent
|
038cc91fcd
|
Digging invaders: fixed a bug where it would reassign long-lasting jobs, making them take forever. Also added a check for the case that invaders cannot dig to any locals.
|
2013-01-04 00:35:47 -05:00 |
expwnent
|
b6f0ae5b14
|
Digging invaders: keep track of who's working on the job, and check periodically to see if they quit.
|
2013-01-04 00:08:54 -05:00 |
expwnent
|
47eca42f68
|
Digging invaders: made it possible to customize which races can dig.
|
2013-01-03 23:18:40 -05:00 |
expwnent
|
8e90ca6b41
|
Merge branch 'eventManager' into diggingInvaders-unstable
|
2013-01-03 22:47:45 -05:00 |
expwnent
|
ec03d567d2
|
EventManager: use WORLD_LOADED instead of MAP_LOADED.
|
2013-01-03 22:47:27 -05:00 |
expwnent
|
0fecdfadb1
|
Digging Invaders: when assigning a job, get rid of old one. Handle loading and unloading. Optimizations for when invaders can already reach someone.
|
2013-01-03 22:46:17 -05:00 |
expwnent
|
ed6dcf9589
|
DiggingInvaders: made invaders dig automatically, instead of on request.
|
2013-01-03 21:25:50 -05:00 |
expwnent
|
f145f8d528
|
Merge branch 'eventManager' into diggingInvaders-unstable
|
2013-01-03 19:32:12 -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 |
expwnent
|
b82d6940b6
|
Digging invaders: started on making invaders keep digging until done.
|
2013-01-03 18:45:53 -05:00 |
expwnent
|
1d6dec54c7
|
Digging Invaders: reorganized the files to make it easier to work with.
|
2013-01-03 18:14:16 -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
|
84b8fae326
|
Merge branch 'eventManager' into diggingInvaders-unstable
|
2013-01-03 15:53:06 -05:00 |
expwnent
|
910e398a7b
|
EventManager: added invasion event.
|
2013-01-03 15:52:56 -05:00 |
expwnent
|
34d9785ce5
|
Digging Invaders: minor changes.
|
2013-01-03 14:38:05 -05:00 |
expwnent
|
b62e50f2e1
|
DiggingInvaders: get rid of the framework for assigning multiple dig/deconstruct/etc operations at the same time.
|
2013-01-03 14:16:10 -05:00 |
expwnent
|
0b68e66dc9
|
DiggingInvaders: fixed a problem with deconstructing hatches.
|
2013-01-03 13:32:50 -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 |
expwnent
|
f60e44c395
|
DiggingInvaders: minor changes.
|
2013-01-03 13:11:11 -05:00 |
Anuradha Dissanayake
|
7b561f108b
|
Fix hotkey detection
|
2013-01-03 22:01:01 +13:00 |
expwnent
|
7586e62374
|
Digging Invaders: fixed a problem with removing constructions.
|
2013-01-02 22:35:05 -05:00 |
expwnent
|
5201870356
|
Digging Invaders: get rid of debug prints.
|
2013-01-02 22:13:23 -05:00 |
expwnent
|
ae43865489
|
Digging Invaders: actually seems to basically work!
|
2013-01-02 22:11:05 -05:00 |
expwnent
|
a0d2f262b0
|
Update submodules.
|
2013-01-02 21:38:53 -05: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
|
d35164656f
|
Merge branch 'recent' into diggingInvaders-unstable
Conflicts:
library/modules/Job.cpp
library/modules/Maps.cpp
|
2013-01-02 11:36:57 -05:00 |
expwnent
|
f680ef7ee3
|
Made git ignore vim swap files.
|
2013-01-02 11:30:06 -05:00 |
expwnent
|
144e0b4dcb
|
Digging Invaders: merged eventManager and recent.
|
2013-01-02 11:26:30 -05:00 |