Commit Graph

7772 Commits (6af5f3b299c0f1f6dca4b23641995d25591d3c74)
 

Author SHA1 Message Date
lethosor f949049dff Merge branch 'docs' into develop 2017-04-29 21:30:06 -04:00
lethosor 2cf6374c8c Merge branch 'docs' 2017-04-29 21:27:59 -04:00
Paul Fenwick 3d86025016 README.md: Fix broken markdown links and header.
Github's markdown parser does not permit newlines between link titles
and link text. This change removes the newlines, resulting in a less
pleasing source, but one which renders when viewed on github.

Github also requires a space between the '#' and text of headings, so
we fix that, too.
2017-04-29 21:21:03 -04:00
lethosor 932a49e89e Re-add workflow keybindings
Several users have asked to have these back, and they don't interfere with the
game unless workflow is enabled.

This reverts part of commit b68cff0384.
2017-04-29 11:06:29 -04:00
lethosor 690fec9d81 manipulator: show social activities in job column 2017-04-28 17:26:20 -04:00
lethosor 71b553b305 Add a few functions to retrieve unit social activities 2017-04-28 17:25:58 -04:00
Lethosor 318cf92f0b Merge pull request #1079 from Amostubal/patch-1
fix of relations errors.
2017-04-25 21:21:03 -04:00
Amostubal bc47803948 fix of relations errors.
There is a lot more errors in this file, mostly called unk variables... I bet they have names, I've tried to figure out what they were renamed too, but I'm not fully understanding the xml.
2017-04-24 07:07:08 -05:00
lethosor 9d5b69cb20 git-describe.cmake: use 8-digit git commit abbreviations
The length here was previously determined automatically, and jumped from 7 to 8
recently, breaking devel/check-release. Since Git seems to think 8 characters is
better now, specify it explicitly to avoid future breakages.
2017-04-23 18:16:00 -04:00
lethosor 22db0e4a1e Bump to 0.43.05-beta2 2017-04-23 17:23:38 -04:00
lethosor 3cfbd735dc Update xml, stonesense, scripts 2017-04-23 17:14:22 -04:00
lethosor 6c616e349c Update news 2017-04-23 17:13:59 -04:00
lethosor 098481c60d Merge branch 'develop' of dfhack/dfhack into develop 2017-04-19 13:45:45 -04:00
lethosor 06737644cd new tweak: hotkey-clear 2017-04-19 13:31:25 -04:00
Japa Illo e36e4fa1c1 Support archery target rotation in RemoteFortressReader 2017-04-05 15:35:48 +05:30
lethosor 93a977bf5c Add @pjf to Authors.rst
Ref #1074
2017-03-30 23:57:55 -04:00
lethosor 155084f32f Merge branch 'develop' of dfhack/dfhack into develop 2017-03-30 23:55:45 -04:00
lethosor b9ac792673 Merge remote-tracking branch 'pjf/readme_fixes' into develop 2017-03-30 23:55:10 -04:00
Paul Fenwick 9edfeb5b8c
README.md: Fix broken markdown links and header.
Github's markdown parser does not permit newlines between link titles
and link text. This change removes the newlines, resulting in a less
pleasing source, but one which renders when viewed on github.

Github also requires a space between the '#' and text of headings, so
we fix that, too.
2017-03-31 12:39:46 +11:00
Japa Illo 06225dd896 Send building items and items kept in buildings separately. 2017-03-30 16:23:14 +05:30
Japa 7c626ba3c2 Actually add the versionInfo function to the RPC list. 2017-03-29 22:05:49 +05:30
Japa bbaf3210f1 Send DF version info over remoteFortressReader 2017-03-29 21:58:12 +05:30
Japa c244901c16 Removed end of line space. (Sorry, travis) 2017-03-29 20:22:09 +05:30
Japa 19a253c132 Merge remote-tracking branch 'DFHack/develop' into develop 2017-03-29 19:46:55 +05:30
lethosor 78cb4a31b9 New tweak: condition-material (fixes bug 9905)
http://www.bay12games.com/dwarves/mantisbt/view.php?id=9905
2017-03-28 09:50:38 -04:00
Japa 5ea964b9cf Send building items with buildings. 2017-03-25 22:23:40 +05:30
lethosor aea76b7ef3 stockflow: make sure that manager order amounts are integers
Fixes #1044
2017-03-18 17:56:06 -04:00
lethosor fa1adbbac4 Allow lua integer writes to accept anything that can be converted to an integer
May address #1044
2017-03-18 17:55:51 -04:00
lethosor a35d5493a4 Update scripts 2017-03-18 17:49:54 -04:00
lethosor 815bdb2e57 Merge remote-tracking branch 'TC01/ruby-no-dl-flag' into develop 2017-03-18 00:51:37 -04:00
lethosor f7f05724aa Merge branch 'develop' of gh:dfhack/dfhack into develop 2017-03-18 00:36:43 -04:00
lethosor 400d22cb76 Update xml (ui_advmode_menu and ui_unit_view_mode) 2017-03-18 00:35:16 -04:00
lethosor 85e0daf15e stonesense: basic 64-bit OS X support 2017-03-18 00:34:07 -04:00
lethosor f17e9d3662 title-folder: fix SDL path on OS X
The Stonesense install script appears to do strange things which cause DF to
load SDL.framework/Versions/A/SDL instead of SDL.framework/SDL. Once the former
is loaded, loading the latter and calling SDL_WM_* functions from it will fail.

A better solution would be to remove parts of the Stonesense fix-libs-*.sh
script(s) that are causing this, since they don't appear to be needed, or
use dlsym() to find the already-opened library/symbols.
2017-03-18 00:31:25 -04:00
lethosor 50a022d81b download_file(): avoid copying files if the correct file already exists 2017-03-18 00:31:15 -04:00
Japa 61c2fb0a11 Merged branch develop into develop 2017-03-18 00:26:01 +05:30
Japa e60d8de5fe Fix array out of bounds errors in remotefortressreader that were crashing linux. 2017-03-18 00:25:46 +05:30
lethosor 38702febf7 Use LUA_(C)PATH_VAR instead of LUA_(C)PATH in luaconf.h
This was apparently changed at some point around Lua 5.3, so a custom LUA_PATH
environment variable could prevent DFHack from initializing.
2017-03-14 00:24:05 -04:00
lethosor 67f39316ce Update xml (assorted viewscreen changes) 2017-03-02 14:05:34 -05:00
lethosor d53c00d726 Update scripts (add install-info) 2017-03-02 14:05:08 -05:00
lethosor 334817fa1b Add Lua API functions to determine architecture 2017-03-02 14:04:34 -05:00
lethosor 15759808e5 Fix "plug" output width for generated-creature-renamer 2017-03-02 14:04:20 -05:00
lethosor 0cc51f8d69 Add support for downloading files in advance, useful for offline builds
Also document this in Compile.rst - there have been complaints about the fact
that DFHack downloads files at build time not being documented at all.
2017-03-01 21:29:17 -05:00
lethosor b675f0fd3c Move old git note to bottom of compilation docs 2017-03-01 20:44:47 -05:00
lethosor ea693c41c4 Update Windows build instructions for 0.43.05 2017-03-01 20:35:36 -05:00
lethosor 43a58f8d85 Remove obsolete settings from Windows build scripts, plus misc. updates
- Added BUILD_DOCS=1 to release scripts
- Removed "breakfast" scripts, which used the same settings as "all", plus a
  release version override, which is rarely used (if at all) and can be done
  separately.
2017-03-01 20:29:46 -05:00
lethosor 13cdc38b2f Update scripts/gui/extended-status (new bed queueing feature) 2017-03-01 15:57:09 -05:00
lethosor c21b7bf941 Add a Painter:key_string() method 2017-03-01 15:56:50 -05:00
lethosor 19695b4ee7 EventManager/eventful: Pass building ID pointers to event handlers
Previously, there was some disagreement over whether event handlers such as
Buildings::updateBuildings() took building pointers or building IDs shoved
into pointers. It turned out to be the latter, which, unfortunately, did not
compile on x64. Passing building IDs isn't possible in all cases, because
building event handlers can be called for recently-deleted buildings too.
Pointers to building IDs do work reliably, though.

Fixes #1003
2017-02-17 22:53:48 -05:00
lethosor 33060c7d0e Bump to beta1 2017-02-11 20:48:37 -05:00