Commit Graph

11646 Commits (4fd6c52687541e64c70770e0202cc4baf2023c13)
 

Author SHA1 Message Date
lethosor f65a981099 Fix indentation 2017-02-04 14:46:38 -05:00
Japa 8313b7768a Merge pull request #1065 from JapaMala/unitProfession
Unit profession
2017-02-03 10:14:26 +05:30
Japa Illo c8e6845a7f Send noble positions and professions along with Units. 2017-02-03 10:08:35 +05:30
Japa Illo d97b0497b3 Add prosession and noble position info to units. 2017-02-02 12:12:28 +05:30
Japa Illo c3c3f37b06 Added more descriptor types, and made it run on world load. 2017-01-26 15:58:43 +05:30
Japa Illo 24a653f77b added ants and apes to the list. 2017-01-26 12:50:37 +05:30
Japa Illo 365624453e Finish up the generated-creature-renamer plugin. 2017-01-26 12:45:40 +05:30
Japa 934d5b32bc Fix creature listing and plugin name 2017-01-26 10:00:38 +05:30
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