Commit Graph

9291 Commits (36df6eac8b649f7787c54d95c93b42280a7f6d81)
 

Author SHA1 Message Date
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
lethosor a2525b92ac Merge remote-tracking branch 'PeridexisErrant/doc-keybinds' into develop 2016-10-23 18:26:42 -04:00
lethosor 314159849b Merge remote-tracking branch 'jlogsdon/docs/manipulator-professions' into develop 2016-10-23 18:24:09 -04:00
lethosor 33ca7638f2 Make DFHack libraries take priority on Linux
Fixes #1008
2016-10-22 13:04:15 -04:00
Japa 25a64a2102 Merged branch develop into develop 2016-10-21 22:55:38 +05:30
Japa a0b0c16a8b Actually apply the designation changes in RemoteFortressReader 2016-10-21 22:55:28 +05:30
lethosor 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
jj 97f29229cd ruby: fix weird freeze when printing large strings to the console on linux64 2016-10-21 17:00:02 +02:00
jj f586692ed6 plugins/ruby: update for 64bits 2016-10-21 14:52:26 +02:00
Jon Pamala Illo 75d7773a94 Move set_df_path.vbs into the directories where it's actually useful. 2016-10-21 10:26:20 +05:30
PeridexisErrant f170b70fde Expand plugin docs for workNow 2016-10-20 18:33:31 +11:00
PeridexisErrant 951d293050 Add, use, and require auto docs for all keybindings 2016-10-20 18:33:31 +11:00
James Logsdon b3ff481461 Add documentation for manipulator professions 2016-10-19 20:55:14 -04:00
lethosor e3ff89ba03 Fix compile error 2016-10-19 16:21:38 -04:00
Japa 701adc12b3 Add ability for remotefortressreader.cpp to accept dig designations. 2016-10-19 22:21:50 +05:30
Japa e3f8d63726 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-10-19 20:01:25 +05:30
Japa adad7e75c3 Ignore df_path. again. 2016-10-19 20:00:56 +05:30
Japa 919507d9a0 Send over dig designations from un-taken job postings in remotefortressreader.cpp. 2016-10-19 20:00:30 +05:30
lethosor b19a0b4305 Update scripts, xml
Fixes #1005
2016-10-19 09:53:51 -04:00
lethosor b1e3c1088c Give loadfile() result a better name for tracebacks 2016-10-19 09:53:12 -04:00
Japa b04083690e Update .gitignore to ignore the 32bit build folder 2016-10-17 19:48:24 +05:30
Japa 84ea03f68c Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-10-16 06:33:04 +05:30
Japa 0e0da1edbe Update windows build scripts to reflect the new folder structure. 2016-10-16 06:32:35 +05:30
lethosor 4d74090b34 Bump version in CMakeLists.txt 2016-10-15 17:27:08 -04:00
lethosor 55d2f00555 Update NEWS.rst and Plugins.rst 2016-10-15 16:37:21 -04:00
lethosor 16c77efb43 Fix whitespace issues 2016-10-15 16:05:33 -04:00
lethosor 4c21bbd5ae Add Lua::TableInsert() helper 2016-10-15 14:55:48 -04:00
lethosor 8a138fcc4c Avoid polluting global namespace in MapCache.h 2016-10-15 14:53:10 -04:00
lethosor 7f7102f90c Distribute a gunzip.pl script
gunzip isn't reliably available on Windows, but IO::Uncompress::Gunzip should
be.

Suggested by Quietust.
2016-10-15 12:09:04 -04:00
Japa b2424f9a59 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-10-15 10:32:13 +05:30
Japa 08cc9f3188 Cast size_t to int explicitly to avoid compiler warning C4267 2016-10-15 10:31:38 +05:30
Japa 98ab357df0 Use size_t in both path methods, to avoid warning C4267 2016-10-15 10:17:38 +05:30
lethosor 9f541481ea Fix some warnings with GCC -Wall 2016-10-15 00:37:18 -04:00
Japa 2e290f4837 Ignore the new VS version folders. 2016-10-15 00:18:25 +05:30
lethosor 0c0d68c9ed Update scripts 2016-10-14 08:56:54 -04:00
Japa a9ccec07bd Merge pull request #1001 from JapaMala/develop
RemoteFortressReader updates
2016-10-13 20:05:21 +05:30
Japa 980b6dd12f Update XML again. 2016-10-13 19:42:40 +05:30
Japa d5e8b5eeba Update XML 2016-10-13 19:35:40 +05:30
Japa 8d84b0d968 Merged branch v0.43.03 into develop 2016-10-13 19:27:06 +05:30