Commit Graph

9034 Commits (9caf6e97e6d50cf9c0a25387821a666ca8bdfaf8)
 

Author SHA1 Message Date
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
expwnent 3c7ca2ad71 Digging invaders: buildings can only be destroyed orthogonally, made path cost deal with hatches and raised bridges, but did NOT yet make job assignment deal with them. 2013-01-05 11:06:46 -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
expwnent a7d6cf5157 Digging invaders: fixed a few problems involving digging and stairs, added a way to debug path cost, added a way to set the cost of each type of invasion job, made invaders only pathfind to one local instead of all of them. 2013-01-04 21:02:09 -05: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
expwnent fd05d30733 Digging invaders: improved edge cost evaluation. 2013-01-04 18:11:38 -05: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 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