Commit Graph

12288 Commits (aa2cf44c4bc2b2787dd0d9ebaf046632ead30877)
 

Author SHA1 Message Date
Japa c659b885b6 Start a plugin to rename generated creatures to have sensible IDs 2017-01-25 23:06:03 +05:30
Quietust cc02ced0ac Fix RTTI in Win64 - offsets are relative to the current module (e.g. the DLL), so it needs to be looked up explicitly 2017-01-21 15:16:06 -06:00
Ben Rosser f0d4a1f563 Add DOWNLOAD_RUBY option to Ruby plugin cmake, defaulting to ON
If DOWNLOAD_RUBY is set to OFF, the build will not attempt to download
a prebuilt libruby.so and not fire a warning that one is not present.
This may be desired if one wants to link dfhack against a newer system
libruby.so, now that dfhack supports ruby 2.x and also supports linking
against system libruby (at least, on Linux), as per the following commit:

df9b5bca73

This also allows the dfhack build to proceed without network access
(once all submodules have been fetched), which at least some Linux
distributions, like Fedora, require.

By default DOWNLOAD_RUBY is set to ON, so this should not change
the behavior of default builds.

I tested that when DOWNLOAD_RUBY is set to OFF, dfhack still launches
and that the Ruby plugin still functions, e.g. by running
```rb_eval puts('Hello world.')``` in the dfhack console.
2017-01-20 17:40:14 -05:00
lethosor e2fc7d3e00 Update OS X compilation instructions
- GCC 4.8+ is now required - remove references to 4.5, XCode 7, etc.
- Homebrew's formula has been renamed to "gcc@4.8". "gcc48" still works as well,
  so applying this change to the master branch isn't urgent.
2017-01-05 18:35:20 -05:00
lethosor affcd658dc title-version: Hide when loading a game (e.g. arena) 2017-01-04 12:30:59 -05:00
lethosor 92f890d3c6 Update xml, scripts (#994 and file_compressor fix) 2017-01-04 12:30:42 -05:00
lethosor cda4e7a300 title-version: add prerelease indicator 2016-12-30 18:03:28 -05:00
lethosor 61d081849e xml: ui_sidebar_menus.command_line fix 2016-12-30 18:02:51 -05:00
lethosor d18beb8daf xml: Add some linux64 offsets, fix ui_sidebar_menus alignment
Fixes #1053
Fixes #1054
Fixes #1055
2016-12-29 15:33:09 -05:00
lethosor 6b3a5ac784 Bump to alpha4 2016-12-29 00:40:43 -05:00
lethosor 408dba9da7 Update NEWS(-dev) and scripts (add fix/tile-occupancy) 2016-12-28 22:12:22 -05:00
Kelly Kinkade c99780aafd Add support for shell crafts. 2016-12-27 23:40:53 -05:00
lethosor 538b07d214 Update xml and fix knowledge_scholar_category_flag::value() custom method
Allows bitfields within unions (#1047, dfhack/df-structures#169)
2016-12-27 23:24:22 -05:00
lethosor cd0d9fed18 stocks: Support getSelectedItem() 2016-12-27 17:41:32 -05:00
Milo Christiansen 8bd92b6a08 Add a Lua module for getting a tile's material (#1031) 2016-12-27 16:49:46 -05:00
lethosor 506d124a98 Update xml
Ref #1047, #1050
2016-12-26 19:41:34 -05:00
lethosor b034a3747a Merge remote-tracking branch 'ab9rf/bitfields' into develop 2016-12-26 19:40:18 -05:00
Kelly Kinkade 3c7d2626e2 df::dfhack_material_category has no constructor, must be manually initialized
see #1047
2016-12-18 17:58:24 -06:00
Lethosor ba48afe908 stockflow: Simplify calculation
See #1046

Use math.floor() for now until we can get Lua 5.3 working on Travis
2016-12-16 14:22:00 -05:00
Lethosor 05f5b6bcf2 Merge pull request #1046 from ab9rf/alpha3-stockflow
stockflow: Fix "integer expected" problem in stockflow
2016-12-16 14:09:59 -05:00
Kelly Kinkade 1419d58b9a stockflow: Use "floor division"
Per suggestion by @dscorbett
2016-12-16 13:04:51 -06:00
Kelly Kinkade 5be77fa63d stockflow: Fix "integer expected" problem in stockflow 2016-12-16 08:09:53 -06:00
lethosor a5eb5d2502 manipulator: Sort custom professions
Also use == instead of string::compare()
2016-12-15 19:18:07 -05:00
lethosor 7b2e6f299f Bump version to 0.43.05-alpha3 2016-12-14 13:18:37 -05:00
lethosor 4c3515cc6b Update NEWS.rst, add NEWS-dev.rst for prerelease changes 2016-12-14 12:59:55 -05:00
lethosor b879efe761 Merge remote-tracking branch 'TC01/tinyxml-update' into develop 2016-12-14 01:13:37 -05:00
Kelly Kinkade 439e13643c better hack to make ruby work on win64 2016-12-13 23:55:20 -06:00
lethosor c8b7dbd255 Fix manipulator crash when selecting profession from empty list
Also add ListColumn::hasSelection()

Fixes #1040
2016-12-11 21:16:21 -05:00
lethosor 697d35a583 Update scripts: Merge dfhack/scripts#8 2016-12-11 18:04:15 -05:00
lethosor f3e2e5e7d4 Update xml 2016-12-11 18:04:00 -05:00
lethosor 9e0221a44e Merge remote-tracking branch 'dscorbett/bitfield-constructors' into develop 2016-12-11 17:52:00 -05:00
lethosor 4c0cb6854f Change minimum GCC version to 4.8 2016-12-11 00:23:16 -05:00
lethosor 4b91d3799e Fix misery docs anchor 2016-12-10 18:30:34 -05:00
lethosor 92c01edf98 Update scripts (fix export-dt-ini) 2016-12-10 18:23:17 -05:00
lethosor e8c8953cbb Re-add and update misery plugin
Closes #1037
Ref #1011
2016-12-10 18:22:32 -05:00
lethosor 3bae9d9d65 Lua API: Make bitfield.whole return an integer, not a decimal 2016-12-10 12:27:43 -05:00
David Corbett acdb369aa8 Avoid non-trivial bitfield constructors 2016-12-09 13:41:14 -05:00
lethosor 0c6c94b310 Merge branch 'develop' of gh:dfhack/dfhack into develop 2016-12-09 11:28:09 -05:00
lethosor 6e16a7a20c Update xml, scripts 2016-12-09 11:27:44 -05:00
lethosor d6fda58ca0 Remove treefarm (PR #1011)
Merge remote-tracking branch 'PeridexisErrant/remove-broken-plugins'

advtools and misery are still partially broken, but parts of them still work, so
repairing them is possible.
2016-12-09 11:20:35 -05:00
Lethosor 1545a4106b Merge pull request #1035 from ab9rf/labormanager-0.43.05-r1
labormanager: fix StoreItemInVehicle labor inference
2016-12-09 11:07:00 -05:00
Kelly Kinkade 1a9d8629c5 labormanager: fix StoreItemInVehicle labor inference (#8)
* labormanager: add deconstruct labor for constructed instruments

* labormanager: fix StoreItemInVehicle labor inference

StoreItemInVehicle requires the labor appropriate to the item being
stashed
2016-12-09 09:54:20 -06:00
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