1d97638579
Mysteriously disappearing code reinserted
2016-12-01 11:10:52 -06:00
6856a7ebe0
Merge pull request #4 from ab9rf/labormanager-0.43.03-working
...
Fix deconstruction of buildings containing items
2016-12-01 11:07:36 -06:00
77a1264a94
Fix deconstruction of buildings containing items
2016-12-01 11:06:40 -06:00
a8eb10f111
Merge remote-tracking branch 'nocico/develop' into develop
2016-11-29 01:55:28 -05:00
ddf447d3de
Merge pull request #1022 from ab9rf/labormanager-0.43.05-r1
...
Use attributes in calculating assignment weight
2016-11-29 01:51:56 -05:00
0ab3005a89
Merge pull request #3 from ab9rf/labormanager-0.43.03-working
...
Incorporate more updates cherrypicked from nocico
2016-11-29 00:24:31 -06:00
d5d0775f1a
Remove redundant cast
2016-11-29 00:22:34 -06:00
5c16b5a2b7
labormanager: multimaterial constructions
2016-11-28 23:53:40 -06:00
d626990ac8
labormanager: trap components
2016-11-28 23:53:39 -06:00
442a12a9b2
labormanager: multimaterial constructions
2016-11-29 05:48:58 +02:00
15b7ba552d
labormanager: trap components
2016-11-29 05:48:58 +02:00
ba4952491a
Update scripts
2016-11-28 00:02:59 -05:00
51c7039f92
Merge pull request #1024 from nocico/develop
...
labormanager: support for jobs in bowyer's shop
2016-11-27 23:57:39 -05:00
7c0fecec14
Merge pull request #2 from ab9rf/labormanager-0.43.03-working
...
Pull working changes forward to 0.43.05
2016-11-27 22:53:29 -06:00
ae48612ebd
labormanager: support for jobs in bowyer's shop
2016-11-27 22:47:53 -06:00
5405c76746
labormanager: support for jobs in bowyer's shop
2016-11-28 05:40:03 +02:00
0acd1c9059
make labormanager know building instruments is furniture hauling
2016-11-26 21:09:31 -06:00
10384fe720
make labormanager know building instruments is furniture hauling
2016-11-26 21:07:02 -06:00
b25fcdecbe
Merge pull request #1 from ab9rf/labormanager-0.43.03-working
...
Harmonize 43.03 and 43.05 versions
2016-11-26 21:02:22 -06:00
ad84217687
fix white space to make travis happy
2016-11-26 20:55:10 -06:00
47426e3e00
Use attributes in calculating assignment weight
2016-11-26 20:55:10 -06:00
a28c4db69a
Finish clipped sentence. (erk.)
2016-11-26 20:55:10 -06:00
61baaa0c37
Docs for labormanager
2016-11-26 20:55:10 -06:00
cbcb148182
Better job assignment algorithm for labormanager.
2016-11-26 20:55:09 -06:00
491d53b76f
fix white space to make travis happy
2016-11-26 18:08:48 -06:00
c009640e74
Merge branch 'labormanager-0.43.05-r1' of https://github.com/ab9rf/dfhack into labormanager-0.43.05-r1
2016-11-26 18:05:16 -06:00
338f6029a7
Use attributes in calculating assignment weight
2016-11-26 17:55:08 -06:00
fe1dd01535
Better job assignment algorithm for labormanager.
2016-11-26 17:55:08 -06:00
8eb4f17b23
Use attributes in calculating assignment weight
2016-11-26 17:37:26 -06:00
b723378a62
Add nocico to Authors.rst ( f71d195)
2016-11-26 14:06:31 -05:00
50dd773d6f
Merge pull request #1020 from nocico/develop
...
make labormanager know building instruments is furniture hauling
2016-11-26 12:55:53 -05:00
f71d19578c
make labormanager know building instruments is furniture hauling
2016-11-26 13:39:20 +02:00
7920f71517
Bad formatting
2016-11-25 00:25:18 -08:00
de0e211e07
Figured I could like test my code.
2016-11-24 23:35:03 -08:00
e490afdf00
Rebuilt slightly to offer bool return val
...
We fail on unknown general ref types now, without modifying the job at
all yet
2016-11-24 22:36:11 -08:00
08840ccabf
Add abbradar to Authors.rst ( da3c6404f)
2016-11-23 19:20:20 -05:00
dd28079f30
Fix ruby.cpp compilation on win64
2016-11-22 22:43:48 -05:00
13eb5e702b
bump to alpha2
2016-11-22 20:50:19 -05:00
b41ace2f8f
Update scripts (travis)
2016-11-22 20:49:38 -05:00
206e9ef993
Re-enable Travis IRC notifications
2016-11-22 17:31:36 -05:00
c7a35d7ece
fix remotefortressreader protobuf error in clean builds
2016-11-22 17:24:36 -05:00
647ef4d556
Fix labormanager whitespace
2016-11-22 17:17:56 -05:00
80e0a91670
Update .travis.yml for 0.43.05
2016-11-22 16:59:34 -05:00
8b964ca2dc
Wipe job_items vector
2016-11-21 06:51:21 -08:00
fba32f2e2f
Also disconnect the job from its items.
2016-11-17 23:25:48 -08:00
67af9f5e82
Add lua bindings for removeJob
2016-11-17 23:04:48 -08:00
45d138191e
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
2016-11-17 23:02:05 -05:00
74f5df99db
Add job remove method
...
Job remove eliminates a job's worker & holder references, if any, puts
the worker on cd, if appropriate, removes the job's postings, eliminates
the job from the global linked list, and then finally deletes it. This
code was tested by incorporating it into autochop and it does make the
plugin work. However, chop jobs don't have holder building references,
and anyway, with DF being 90% edge case by volume, this could use a heck
of a lot more testing.
I saw elsewhere code that prevented worker removal if the job was a
special job, and that made me feel funny so I made the job remove method
not work if the job is a special job.
2016-11-17 19:54:41 -08:00
df9b5bca73
Allow ruby plugin to try more than one library path, including libruby.so on Linux
2016-11-17 10:31:48 -05:00
dce00a5034
Partial compilation fixes for advtools, misery
2016-11-16 15:21:13 -05:00
Kelly Kinkade
lethosor
Lethosor
nocico
Stephen Baynham