Commit Graph

15146 Commits (942cbe2015e6ef3f352a9df1b1db963a5141b109)
 

Author SHA1 Message Date
Lethosor 8012c5686b Merge pull request #1034 from ab9rf/labormanager-0.43.05-r1
labormanager: add deconstruct labor for constructed instruments
2016-12-08 17:15:04 -05:00
Kelly Kinkade 50ce9942f4 labormanager: add deconstruct labor for constructed instruments (#7) 2016-12-08 16:01:14 -06:00
Ben Rosser 144675c74b Update bundled tinyxml version from 2.5.3 to 2.6.2
Upstream has moved onto tinyxml2, so this is likely to be the last
release of the original tinyxml (2.6.2 came out in 2011). dfhack
should therefore probably ship 2.6.2, since it's unlikely there will
ever be future fixes to this code. The upstream changelog (taken
from "changes.txt" in upstream tarball) contains many bugfixes and
is included in the commit message below.

2.5.4
- A TiXMLDocument can't be a sub-node. Block this from happening in
  the 'replace'. Thanks Noam.
- [ 1714831 ] TiXmlBase::location is not copied by copy-ctors, fix
  reported and suggested by Nicola Civran.
- Fixed possible memory overrun in the comment reading code - thanks
  gcarlton77

2.5.5
- Alex van der Wal spotted incorrect types (lf) being used in print
  and scan. robertnestor pointed out some problems with the simple
  solution. Types updated.
- Johannes Hillert pointed out some bug typos.
- Christian Mueller identified inconsistent error handling with
  Attributes.
- olivier barthelemy also reported a problem with double truncation,
  also related to the %lf issue.
- zaelsius came up with a great (and simple) suggestion to fix
  QueryValueAttribute truncating strings.
- added some null pointer checks suggested by hansenk
- Sami V�is�nen found a (rare) buffer overrun that could occur in
  parsing.
- vi tri filed a bug that led to a refactoring of the attribute
  setting mess (as well as adding a missing SetDoubleAttribute() )
- removed TIXML_ERROR_OUT_OF_MEMORY. TinyXML does not systematically
  address OOO, and the notion it does is misleading.
- vanneto, keithmarshall, others all reported the warning from
  IsWhiteSpace() usage. Cleaned this up - many thanks to everyone
  who reported this one.
- tibur found a bug in end tag parsing

2.6.2
- Switched over to VC 2010
- Fixed up all the build issues arising from that. (Lots of latent
  build problems.)
- Removed the old, now unmaintained and likely not working, build
  files.
- Fixed some static analysis issues reported by orbitcowboy from
  cppcheck.
- Bayard 95 sent in analysis from a different analyzer - fixes
  applied from that as well.
- Tim Kosse sent a patch fixing an infinite loop.
- Ma Anguo identified a doc issue.
- Eddie Cohen identified a missing qualifier resulting in a compilation
  error on some systems.
- Fixed a line ending bug. (What year is this? Can we all agree on a
  format for text files? Please? ...oh well.)
2016-12-06 21:40:30 -05:00
lethosor 8521b830b2 Merge remote-tracking branch 'CannibalVox/job_remove' into develop 2016-12-05 15:24:37 -05:00
lethosor 672410bea7 travis: Use sphinx 1.4 only for now
The sphinx.domains.cpp extension (which I'm not sure we're explicitly using)
generates a warning with parallel docs builds, which causes the Travis build to
fail. This may be something that needs to be fixed upstream.
2016-12-05 12:21:27 -05:00
lethosor a5afd98863 travis: install requests[security] to silence sphinx warning 2016-12-05 12:14:08 -05:00
jj 8488b1a953 ruby: use correct raw string length with encodings 2016-12-05 10:29:16 +01:00
Stephen Baynham 595f3857b6 Reverse the param order of these two methods
The current way doesn't match other Job module methods
2016-12-01 20:13:49 -08: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 a8eb10f111 Merge remote-tracking branch 'nocico/develop' into develop 2016-11-29 01:55:28 -05: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
nocico 442a12a9b2 labormanager: multimaterial constructions 2016-11-29 05:48:58 +02:00
nocico 15b7ba552d labormanager: trap components 2016-11-29 05:48:58 +02:00
lethosor ba4952491a Update scripts 2016-11-28 00:02:59 -05:00
Lethosor 51c7039f92 Merge pull request #1024 from nocico/develop
labormanager: support for jobs in bowyer's shop
2016-11-27 23:57:39 -05: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 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
lethosor b723378a62 Add nocico to Authors.rst (f71d195) 2016-11-26 14:06:31 -05:00
Lethosor 50dd773d6f Merge pull request #1020 from nocico/develop
make labormanager know building instruments is furniture hauling
2016-11-26 12:55:53 -05:00
nocico f71d19578c make labormanager know building instruments is furniture hauling 2016-11-26 13:39:20 +02:00
Stephen Baynham 7920f71517 Bad formatting 2016-11-25 00:25:18 -08:00
Stephen Baynham de0e211e07 Figured I could like test my code. 2016-11-24 23:35:03 -08:00
Stephen Baynham e490afdf00 Rebuilt slightly to offer bool return val
We fail on unknown general ref types now, without modifying the job at
all yet
2016-11-24 22:36:11 -08:00
lethosor 08840ccabf Add abbradar to Authors.rst (da3c6404f) 2016-11-23 19:20:20 -05:00
lethosor dd28079f30 Fix ruby.cpp compilation on win64 2016-11-22 22:43:48 -05:00
lethosor 13eb5e702b bump to alpha2 2016-11-22 20:50:19 -05:00