Kelly Martin
|
d2ec52fa0b
|
Merge branch 'master' into autolabor
|
2012-11-30 21:47:30 -06:00 |
|
Kelly Martin
|
05dce0d2f1
|
Fix inadvertently prematurely terminated block comment.
|
2012-11-30 21:24:18 -06:00 |
|
Kelly Martin
|
e5f509a994
|
autofarm: sync with changes to structures for df-item.xml
|
2012-11-30 20:51:40 -06:00 |
|
Kelly Martin
|
021d089709
|
sync structures
|
2012-11-30 20:25:19 -06:00 |
|
Kelly Martin
|
384a667e97
|
Assorted progress on new autolabor. Still lots of issues.
|
2012-11-30 20:22:58 -06:00 |
|
Kelly Martin
|
63e4c16aa1
|
Sync structures
|
2012-11-30 20:22:29 -06:00 |
Anuradha Dissanayake
|
6bc6f3e555
|
Merge branch 'search'
|
2012-12-01 10:21:37 +13:00 |
|
Kelly Martin
|
5f3328dcb2
|
Merge branch 'master' into autolabor
Conflicts:
plugins/autolabor.cpp
|
2012-11-30 11:25:41 -06:00 |
|
Kelly Martin
|
eecb604800
|
Sync submodules
|
2012-11-30 11:23:58 -06:00 |
|
Kelly Martin
|
5d8adbc779
|
Merge branch 'master' of https://github.com/jjyg/dfhack.git
|
2012-11-30 11:15:15 -06:00 |
|
Kelly Martin
|
57233cb350
|
Merge branch 'master' of https://github.com/angavrilov/dfhack.git
Conflicts:
scripts/autofarm.rb (resolved with added bug correction)
|
2012-11-30 11:09:03 -06:00 |
|
Kelly Martin
|
9e30bf0dff
|
Autofarm: use player's actual seed stocks as basis for plantable seeds, instead of player entity's hypothetically plantable seeds. Avoids designating a plot for planting with seeds the player doesn't have.
|
2012-11-30 11:05:37 -06:00 |
Alexander Gavrilov
|
0bfe006016
|
Try to reimplement the inventory monitor by falconne in lua.
For no other reason than to provide a complete example of lua
interface for a native plugin :)
TODO: paint the graph in the right pane.
|
2012-11-30 19:10:17 +04:00 |
jj
|
9ed7a56202
|
deathcause: handle non-dead units
|
2012-11-30 15:50:35 +01:00 |
|
Anuradha Dissanayake
|
210c1650ec
|
Add stockpile screen searching capability
|
2012-12-01 01:01:04 +13:00 |
|
Alexander Gavrilov
|
2cb594ba89
|
Tweak the workflow lua api: include history in output of listConstraints.
|
2012-11-30 14:48:05 +04:00 |
|
Anuradha Dissanayake
|
abe027c940
|
Copy changes from ag fork
|
2012-11-30 22:44:05 +13:00 |
|
Anuradha Dissanayake
|
13666ec6e6
|
Merge remote-tracking branch 'remotes/origin/automaterial'
|
2012-11-30 20:27:32 +13:00 |
|
Anuradha Dissanayake
|
d2a13ad2c7
|
Merge branch 'autopasture'
|
2012-11-30 19:53:14 +13:00 |
|
Anuradha Dissanayake
|
d59d1c652e
|
Fix gcc compile of search plugin
|
2012-11-30 19:50:42 +13:00 |
|
Kelly Martin
|
f8dea0e9f9
|
Autofarm: only try to plant things that have seeds.
|
2012-11-29 18:19:53 -06:00 |
Warmist
|
0fb5ad7729
|
Some readme and bugfixes
|
2012-11-30 01:17:01 +02:00 |
|
Warmist
|
c31b320722
|
Building now respects required items.
|
2012-11-30 00:02:03 +02:00 |
|
Warmist
|
49de3fe237
|
Removed spam yet again...
|
2012-11-29 20:50:02 +02:00 |
|
Warmist
|
471d15ba4c
|
New building selection dialog.
|
2012-11-29 20:49:16 +02:00 |
|
Warmist
|
346b402a0f
|
Allow look up/down, unsuspend job if pressing wait with job.
|
2012-11-29 18:49:36 +02:00 |
|
Warmist
|
f617d2844b
|
Fixed look exit and allow skip messages
|
2012-11-29 18:33:04 +02:00 |
|
jj
|
184082b379
|
scripts/lever: fix for links to cage/support
|
2012-11-29 17:11:29 +01:00 |
|
jj
|
d7f7538d01
|
ruby: fix Pointer assignment
|
2012-11-29 17:11:29 +01:00 |
|
Warmist
|
3858fb320d
|
in Advfort- splint removeconstruction into building/construction removal.
|
2012-11-29 17:50:22 +02:00 |
|
Warmist
|
5b53f07905
|
Real construction removal added.
|
2012-11-29 17:24:45 +02:00 |
|
Warmist
|
2d4fc739ed
|
Removed console spam
|
2012-11-29 17:16:58 +02:00 |
|
Warmist
|
7f23c1f55f
|
Added ability to look in advfort, moved to tiletypes and fixed most of predicates
|
2012-11-29 17:16:32 +02:00 |
|
Alexander Gavrilov
|
5ea26d9cae
|
Only show the advanced new constraint dialog on Shift-Enter.
Upon reflection it is a bit too scary to be always shown.
|
2012-11-29 16:27:51 +04:00 |
|
Warmist
|
364dd01142
|
Allowed moving up/down in advfort, now correctly checks for main weapon.
|
2012-11-29 12:41:27 +02:00 |
|
Anuradha Dissanayake
|
3095c43d26
|
Fix location of workshop ui, based on menu width
|
2012-11-29 23:15:24 +13:00 |
|
Warmist
|
57b69da1f0
|
Merge branch 'master' of https://github.com/angavrilov/dfhack
|
2012-11-29 12:13:28 +02:00 |
|
Warmist
|
7889a29842
|
Some help on advfort and gm-editor
|
2012-11-29 12:12:42 +02:00 |
|
Warmist
|
f4d048526a
|
Moved advfort to gui subfolder
|
2012-11-29 12:10:25 +02:00 |
|
Warmist
|
1226f5c990
|
Increased speed of adv-fort a lot, now filters keypresses to be more intuitive.
|
2012-11-29 11:56:05 +02:00 |
|
Alexander Gavrilov
|
94e6690586
|
Don't complain about fake input tokens in simulateInput.
|
2012-11-29 13:37:16 +04:00 |
|
Warmist
|
028b535598
|
removed used minw for labels
|
2012-11-29 11:13:26 +02:00 |
|
Warmist
|
5755addc8a
|
Revert "Added minimal width specification to label text tokens."
This reverts commit 8081ab8f51.
|
2012-11-29 10:57:40 +02:00 |
|
Warmist
|
fe2fbe347c
|
Added advfort script, now you can have adventurer forts!!!!!
|
2012-11-29 02:26:10 +02:00 |
|
Warmist
|
2c9b560872
|
Made dfusion not stop df on input.
|
2012-11-28 22:13:28 +02:00 |
|
Warmist
|
01966167f6
|
gm-editor updated to use widgets.
|
2012-11-28 21:13:42 +02:00 |
|
jj
|
771a5ac50b
|
ruby: tweak flagarray#inspect
|
2012-11-28 20:08:34 +01:00 |
|
jj
|
614225cc5f
|
follow rename itemst.flags.artifact1 -> artifact
|
2012-11-28 19:48:47 +01:00 |
|
Warmist
|
8081ab8f51
|
Added minimal width specification to label text tokens.
|
2012-11-28 19:13:17 +02:00 |
|
Warmist
|
3964c8a581
|
gm-editor, set field to lua return value.
|
2012-11-28 17:40:37 +02:00 |