jj
|
8488b1a953
|
ruby: use correct raw string length with encodings
|
2016-12-05 10:29:16 +01:00 |
Lethosor
|
eaf9b75a18
|
Merge pull request #1026 from ab9rf/labormanager-0.43.05-r1
labormanager: fix deconstruction of buildings containing items
|
2016-12-01 18:41:10 -05:00 |
Kelly Kinkade
|
1eaa2033dc
|
Merge pull request #6 from ab9rf/labormanager-0.43.03-working
further tweak building construction labor identification
|
2016-12-01 14:38:21 -06:00 |
|
Kelly Kinkade
|
ad6d6fbaa6
|
further tweak building construction labor identification
It's always more complicated than you expect....
|
2016-12-01 14:36:46 -06:00 |
|
Kelly Kinkade
|
1fa997612f
|
Merge pull request #5 from ab9rf/labormanager-0.43.03-working
Mysteriously disappearing code reinserted
|
2016-12-01 11:12:39 -06:00 |
|
Kelly Kinkade
|
1d97638579
|
Mysteriously disappearing code reinserted
|
2016-12-01 11:10:52 -06:00 |
|
Kelly Kinkade
|
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 |
|
Kelly Kinkade
|
77a1264a94
|
Fix deconstruction of buildings containing items
|
2016-12-01 11:06:40 -06:00 |
|
Lethosor
|
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 |
|
Kelly Kinkade
|
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 |
|
Kelly Kinkade
|
d5d0775f1a
|
Remove redundant cast
|
2016-11-29 00:22:34 -06:00 |
nocico
|
5c16b5a2b7
|
labormanager: multimaterial constructions
|
2016-11-28 23:53:40 -06:00 |
|
nocico
|
d626990ac8
|
labormanager: trap components
|
2016-11-28 23:53:39 -06:00 |
|
Kelly Kinkade
|
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 |
|
nocico
|
ae48612ebd
|
labormanager: support for jobs in bowyer's shop
|
2016-11-27 22:47:53 -06:00 |
|
nocico
|
5405c76746
|
labormanager: support for jobs in bowyer's shop
|
2016-11-28 05:40:03 +02:00 |
|
nocico
|
0acd1c9059
|
make labormanager know building instruments is furniture hauling
|
2016-11-26 21:09:31 -06:00 |
|
nocico
|
10384fe720
|
make labormanager know building instruments is furniture hauling
|
2016-11-26 21:07:02 -06:00 |
|
Kelly Kinkade
|
ad84217687
|
fix white space to make travis happy
|
2016-11-26 20:55:10 -06:00 |
|
Kelly Kinkade
|
47426e3e00
|
Use attributes in calculating assignment weight
|
2016-11-26 20:55:10 -06:00 |
|
Kelly Kinkade
|
cbcb148182
|
Better job assignment algorithm for labormanager.
|
2016-11-26 20:55:09 -06:00 |
|
Kelly Kinkade
|
491d53b76f
|
fix white space to make travis happy
|
2016-11-26 18:08:48 -06:00 |
|
Kelly Kinkade
|
8eb4f17b23
|
Use attributes in calculating assignment weight
|
2016-11-26 17:37:26 -06:00 |
|
nocico
|
f71d19578c
|
make labormanager know building instruments is furniture hauling
|
2016-11-26 13:39:20 +02:00 |
lethosor
|
dd28079f30
|
Fix ruby.cpp compilation on win64
|
2016-11-22 22:43:48 -05:00 |
|
lethosor
|
c7a35d7ece
|
fix remotefortressreader protobuf error in clean builds
|
2016-11-22 17:24:36 -05:00 |
|
lethosor
|
647ef4d556
|
Fix labormanager whitespace
|
2016-11-22 17:17:56 -05:00 |
|
lethosor
|
45d138191e
|
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
|
2016-11-17 23:02:05 -05:00 |
|
lethosor
|
df9b5bca73
|
Allow ruby plugin to try more than one library path, including libruby.so on Linux
|
2016-11-17 10:31:48 -05:00 |
|
lethosor
|
dce00a5034
|
Partial compilation fixes for advtools, misery
|
2016-11-16 15:21:13 -05:00 |
|
lethosor
|
8d9b888410
|
Revert "fixed MD5 hash of win64 ruby lib."
Unable to get anything other than 8a856 for the extracted library on my end
This reverts commit fbaf2697cb.
|
2016-11-14 14:16:43 -05:00 |
|
Kelly Kinkade
|
80ff369059
|
Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1
|
2016-11-08 12:07:30 -06:00 |
|
Kelly Kinkade
|
8fec45696d
|
Better job assignment algorithm for labormanager.
|
2016-11-08 12:01:24 -06:00 |
Japa Illo
|
6895f3fbed
|
remove tabs
|
2016-11-08 15:13:43 +05:30 |
|
Japa Illo
|
5e204069ce
|
update stonesense
|
2016-11-08 15:13:06 +05:30 |
|
Japa Illo
|
20b9aab8db
|
moved remotefortressreader.cpp to its own directory.
|
2016-11-08 15:11:27 +05:30 |
|
Japa Illo
|
fbaf2697cb
|
fixed MD5 hash of win64 ruby lib.
|
2016-11-08 15:10:43 +05:30 |
|
Japa Illo
|
2935032a1e
|
Add .proto files to plugin sources when used, to make it conventient to open it from the IDE.
|
2016-11-08 15:10:01 +05:30 |
|
Japa
|
ebc1a6d85e
|
Add functions to get and set the pause state in DF
|
2016-11-08 13:40:08 +05:30 |
|
Japa Illo
|
99051f176b
|
Add a single bool dfproto message, to pausing and checking pause state
|
2016-11-06 10:08:28 +05:30 |
|
lethosor
|
939b177673
|
Merge branch 'develop' of dfhack/dfhack into develop
|
2016-11-02 16:26:33 -04:00 |
|
lethosor
|
04ad7a0a42
|
Replace some instances of "cmake -E copy_if_different" with a standalone script
@JapaMala reported that CMake < 3.5 doesn't support copy_if_different with
multiple source files.
https://cmake.org/cmake/help/v3.5/release/3.5.html#command-line
|
2016-11-02 16:23:32 -04:00 |
|
Japa
|
e769041983
|
Fix crash bug in remotefortressreader, that happened every time the user resumed.
|
2016-11-01 23:34:56 +05:30 |
|
Japa
|
a50af3e96c
|
Update stonesense
|
2016-10-31 22:52:45 +05:30 |
|
Japa
|
d8f3d7d8f9
|
Send dye color with items in remotefortressreader.cpp
|
2016-10-31 22:52:17 +05:30 |
|
Japa
|
8a66e22522
|
Merged branch develop into develop
|
2016-10-31 17:39:02 +05:30 |
|
Japa
|
335607d1f8
|
Update Stonesense.
|
2016-10-31 17:38:43 +05:30 |
|
lethosor
|
2e6c7a90be
|
fix whitespace
|
2016-10-31 01:58:40 -04:00 |
|
lethosor
|
30f4617abf
|
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
|
2016-10-31 01:56:49 -04:00 |
|
lethosor
|
9e97ccbb50
|
Use system libruby on osx64 (since ruby 1.8 and 2 are supported now)
|
2016-10-29 19:08:54 -04:00 |