Commit Graph

7457 Commits (7c0fecec147fe412f3ab7bd25d4d5f1a1a625a9c)
 

Author SHA1 Message Date
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 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 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
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 a28c4db69a Finish clipped sentence. (erk.) 2016-11-26 20:55:10 -06:00
Kelly Kinkade 61baaa0c37 Docs for labormanager 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 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
Kelly Kinkade 338f6029a7 Use attributes in calculating assignment weight 2016-11-26 17:55:08 -06:00
Kelly Kinkade fe1dd01535 Better job assignment algorithm for labormanager. 2016-11-26 17:55:08 -06:00
Kelly Kinkade 8eb4f17b23 Use attributes in calculating assignment weight 2016-11-26 17:37:26 -06: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
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