30f4617abf
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
2016-10-31 01:56:49 -04:00
9e97ccbb50
Use system libruby on osx64 (since ruby 1.8 and 2 are supported now)
2016-10-29 19:08:54 -04:00
8b7af8ba09
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 19:00:58 -04:00
4e7f2b9579
win64 ruby 2
2016-10-29 19:00:28 -04:00
82f42addcb
Merged branch develop into develop
2016-10-29 13:32:38 +05:30
ea9992239b
Send building items, and send fake item types for boxes and bags.
2016-10-29 13:31:51 +05:30
a84958a390
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 02:40:14 -04:00
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
148202bcba
Use Binsearch for finding items.
2016-10-29 08:54:27 +05:30
0edce2b3ae
Merged branch develop into develop
2016-10-29 00:28:51 +05:30
30801697d9
Send items sitting on the floor through remoteFortressReader
2016-10-29 00:28:37 +05:30
c640006069
ruby: some more updates for x64, fix df_flagarray size
2016-10-28 16:40:14 +02:00
d62d263793
ruby: Fix potential onupdate crash when cur_year is missing
2016-10-26 20:55:16 -04:00
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
defedb351e
Fix raw_vcall crash on Linux/OS X x64
2016-10-26 09:34:14 -04:00
6383ca13bf
Finish clipped sentence. (erk.)
2016-10-25 18:10:29 -05:00
385d34490b
Docs for labormanager
2016-10-25 18:02:07 -05:00
4e933316ca
Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1
2016-10-25 17:06:01 -05:00
a04ed641b7
SPACES not TABS
2016-10-25 17:03:45 -05:00
9aa6b84e24
alphabetical order
2016-10-25 16:55:37 -05:00
18235da9d6
add a misisng labor rule for leather crafts
2016-10-25 16:45:25 -05:00
cffd3be591
Move labormanager out of dev
2016-10-25 16:34:20 -05:00
2c230f0d3e
Improve protobuf file regeneration (no longer uses a dummy status.txt file)
2016-10-24 22:51:27 -04:00
4fdbba0207
Only touch protobuf generated files if they actually changed
2016-10-24 22:28:51 -04:00
8ae513042f
Fix mismatched backquotes in History.rst
2016-10-24 10:06:55 -04:00
5c83c16a99
Fix memview x64 address display
2016-10-24 10:06:41 -04:00
4feab67a93
Fix Python 2 compatibility
...
Ref #972
2016-10-23 18:28:41 -04:00
a2525b92ac
Merge remote-tracking branch 'PeridexisErrant/doc-keybinds' into develop
2016-10-23 18:26:42 -04:00
314159849b
Merge remote-tracking branch 'jlogsdon/docs/manipulator-professions' into develop
2016-10-23 18:24:09 -04:00
33ca7638f2
Make DFHack libraries take priority on Linux
...
Fixes #1008
2016-10-22 13:04:15 -04:00
25a64a2102
Merged branch develop into develop
2016-10-21 22:55:38 +05:30
a0b0c16a8b
Actually apply the designation changes in RemoteFortressReader
2016-10-21 22:55:28 +05:30
3df74de021
Fix rb_dfget_vtable_ptr on x64
...
This was causing rb_dfget_rtti_classname to receive a truncated pointer and
crash
2016-10-21 11:46:53 -04:00
97f29229cd
ruby: fix weird freeze when printing large strings to the console on linux64
2016-10-21 17:00:02 +02:00
f586692ed6
plugins/ruby: update for 64bits
2016-10-21 14:52:26 +02:00
75d7773a94
Move set_df_path.vbs into the directories where it's actually useful.
2016-10-21 10:26:20 +05:30
f170b70fde
Expand plugin docs for workNow
2016-10-20 18:33:31 +11:00
951d293050
Add, use, and require auto docs for all keybindings
2016-10-20 18:33:31 +11:00
b3ff481461
Add documentation for manipulator professions
2016-10-19 20:55:14 -04:00
e3ff89ba03
Fix compile error
2016-10-19 16:21:38 -04:00
701adc12b3
Add ability for remotefortressreader.cpp to accept dig designations.
2016-10-19 22:21:50 +05:30
e3f8d63726
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-10-19 20:01:25 +05:30
adad7e75c3
Ignore df_path. again.
2016-10-19 20:00:56 +05:30
919507d9a0
Send over dig designations from un-taken job postings in remotefortressreader.cpp.
2016-10-19 20:00:30 +05:30
b19a0b4305
Update scripts, xml
...
Fixes #1005
2016-10-19 09:53:51 -04:00
b1e3c1088c
Give loadfile() result a better name for tracebacks
2016-10-19 09:53:12 -04:00
b04083690e
Update .gitignore to ignore the 32bit build folder
2016-10-17 19:48:24 +05:30
84ea03f68c
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-10-16 06:33:04 +05:30
0e0da1edbe
Update windows build scripts to reflect the new folder structure.
2016-10-16 06:32:35 +05:30
4d74090b34
Bump version in CMakeLists.txt
2016-10-15 17:27:08 -04:00
lethosor
Jon Pamala Illo
jj
Kelly Kinkade
PeridexisErrant
James Logsdon