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
7367a8b341
Merged branch develop into develop
2016-11-08 13:40:24 +05:30
Japa
ebc1a6d85e
Add functions to get and set the pause state in DF
2016-11-08 13:40:08 +05:30
lethosor
a5a32bf7b1
Merge branch 'develop' of dfhack/dfhack into develop
2016-11-07 15:07:48 -05:00
lethosor
5fb986bde1
Warn for GCC versions before 4.8
2016-11-07 15:07:27 -05:00
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
4941c06654
Only use TBZ2 generator on OS X
2016-10-31 02:06:06 -04:00
lethosor
45ff1a0353
Add architecture to package names
2016-10-31 02:05:46 -04:00
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
lethosor
8b7af8ba09
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 19:00:58 -04:00
lethosor
4e7f2b9579
win64 ruby 2
2016-10-29 19:00:28 -04:00
Jon Pamala Illo
82f42addcb
Merged branch develop into develop
2016-10-29 13:32:38 +05:30
Jon Pamala Illo
ea9992239b
Send building items, and send fake item types for boxes and bags.
2016-10-29 13:31:51 +05:30
lethosor
a84958a390
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 02:40:14 -04:00
lethosor
ec222c0b24
Catch exceptions in stockpile (un)serialization
...
From #964 , protobuf exceptions in loadstock/savestock would either fail by only
logging an error to the console (when run from the Lua UI) or by crashing the
game entirely (when run from the console).
Figuring out what actually causes the exceptions in the first place (possibly a
misunderstood structure layout?) would be a better solution than this, but this
will at least stop crashes for now.
2016-10-29 02:35:27 -04:00
Japa
148202bcba
Use Binsearch for finding items.
2016-10-29 08:54:27 +05:30
Japa
0edce2b3ae
Merged branch develop into develop
2016-10-29 00:28:51 +05:30
Japa
30801697d9
Send items sitting on the floor through remoteFortressReader
2016-10-29 00:28:37 +05:30
jj
c640006069
ruby: some more updates for x64, fix df_flagarray size
2016-10-28 16:40:14 +02:00
PeridexisErrant
cdf24efe43
Remove plugins - all broken since 34.11
...
This changes nothing at all as far as any DFHack user is concerned, as
these plugins have not been possible to build since DF 34.11 - and would
have to be rewritten for compatiblity with new native-DF systems.
"treefarm" is additionally replaced by "autochop".
In the unlikely event that a developer wants the source code for
something... that's what version control is for!
2016-10-27 23:35:29 +11:00
lethosor
d62d263793
ruby: Fix potential onupdate crash when cur_year is missing
2016-10-26 20:55:16 -04:00
lethosor
cf329c7ceb
Ruby: fix Qnil and Qtrue constants with 64-bit Ruby 2.x
...
These have different values on x64 Ruby 2.x (see USE_FLONUM in ruby.h in the
ruby source). This was causing dump_rb_error to crash, since it was walking an
array until it got to Qnil (but thinking Qnil was 4 instead of 8) and trying to
print each element as a string. There were probably more subtle issues with
Qnil and Qtrue being wrong too.
2016-10-26 20:44:35 -04:00
lethosor
defedb351e
Fix raw_vcall crash on Linux/OS X x64
2016-10-26 09:34:14 -04:00
Kelly Kinkade
6383ca13bf
Finish clipped sentence. (erk.)
2016-10-25 18:10:29 -05:00
Kelly Kinkade
385d34490b
Docs for labormanager
2016-10-25 18:02:07 -05:00
Kelly Kinkade
4e933316ca
Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1
2016-10-25 17:06:01 -05:00
Kelly Kinkade
a04ed641b7
SPACES not TABS
2016-10-25 17:03:45 -05:00
Kelly Kinkade
9aa6b84e24
alphabetical order
2016-10-25 16:55:37 -05:00
Kelly Kinkade
18235da9d6
add a misisng labor rule for leather crafts
2016-10-25 16:45:25 -05:00
Kelly Kinkade
cffd3be591
Move labormanager out of dev
2016-10-25 16:34:20 -05:00
lethosor
2c230f0d3e
Improve protobuf file regeneration (no longer uses a dummy status.txt file)
2016-10-24 22:51:27 -04:00
lethosor
4fdbba0207
Only touch protobuf generated files if they actually changed
2016-10-24 22:28:51 -04:00
lethosor
8ae513042f
Fix mismatched backquotes in History.rst
2016-10-24 10:06:55 -04:00
lethosor
5c83c16a99
Fix memview x64 address display
2016-10-24 10:06:41 -04:00
lethosor
4feab67a93
Fix Python 2 compatibility
...
Ref #972
2016-10-23 18:28:41 -04:00