Commit Graph

9129 Commits (64650374325e62064e97375167c8349ff88705ae)
 

Author SHA1 Message Date
lethosor e3e68a8df9 Add a search option to the location occupation menu 2015-12-23 16:57:43 -05:00
lethosor 9bf7e550a7 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-12-22 19:35:52 -05:00
lethosor a75a8cb496 Update version in CMakeLists.txt 2015-12-22 19:35:40 -05:00
lethosor 14f1e6b06c Improve prerelease warning somewhat 2015-12-22 19:34:54 -05:00
Lethosor 9fb1cf590d Merge pull request #775 from txtsd/distrofix
Use distro_fixes.sh from LNP if it exists
2015-12-22 14:28:42 -05:00
txtsd 07e59139fd Use distro_fixes.sh from LNP if it exists 2015-12-23 00:38:03 +05:30
lethosor 2a2ab00ca9 Add "map" parameter to a lot of drawing functions
Ref #746
2015-12-22 11:42:51 -05:00
lethosor c9eab65c96 Fix more produce() calls 2015-12-22 09:54:00 -05:00
lethosor 10c72a3d5d Fix produce() call in modules/Items.cpp 2015-12-22 09:46:01 -05:00
lethosor f6e30efee7 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-12-22 09:43:33 -05:00
lethosor e4ff4fe64c Update xml 2015-12-22 09:43:17 -05:00
Lethosor 285d48fb60 Merge pull request #774 from TheBloke/Docs_misc
Compile docs: Misc changes: Linux re building docs/pip; Windows re MSVC requirement and vs VStudio; Windows re command line compile with Bash.
2015-12-21 21:50:22 -05:00
TheBloke ce0322e8fd Word addition 2015-12-22 02:02:12 +00:00
TheBloke 203b6b967d Windows: new section on using Bash to compile on command line under Windows 2015-12-22 01:57:39 +00:00
TheBloke 017afec271 Word order 2015-12-22 01:44:49 +00:00
TheBloke df7edaf37d Windows: clarification on requirement of MSVC vs Visual Studio and basic explanation why 2015-12-22 01:43:38 +00:00
TheBloke 5648adbc2c Linux: Building docs: Some clarification on pip and sphinx-build 2015-12-22 01:39:39 +00:00
lethosor 24ec588245 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-12-21 20:38:29 -05:00
lethosor 114c217d52 Remove createitem deprecation notice 2015-12-21 20:38:15 -05:00
Lethosor 165b961f50 Merge pull request #773 from TheBloke/Docs_Compile_Windows_MSVC_SP1_Source
Compile docs: Windows: Add direct download link for MSVC 2010 SP1
2015-12-20 20:11:35 -05:00
TheBloke b5e91d78aa Typo 2015-12-20 21:33:02 +00:00
TheBloke 219a6c7a26 Compile docs: Windows: Add direct download link for MSVC 2010 SP1 2015-12-20 21:25:25 +00:00
lethosor ef27018545 Update xml 2015-12-20 15:19:32 -05:00
lethosor eeb0fc7a0f update xml 2015-12-19 23:12:26 -05:00
Lethosor e3420a5e67 Merge pull request #770 from eswald/instruments
Stockflow repairs
2015-12-19 23:11:55 -05:00
lethosor 97a39e0c53 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-12-19 17:09:47 -05:00
lethosor eb1ae54d63 Add ui_lever_target_type scan to find-offsets 2015-12-19 17:09:29 -05:00
Alexander Gavrilov 5eccb1ed1c Fix find-offsets for cur_year_tick on windows.
The old reference moved far away, so switch to a new one.
2015-12-19 23:03:40 +03:00
lethosor f0013ced56 tabs to spaces 2015-12-19 11:16:43 -05:00
lethosor ea79fc692a Update xml 2015-12-19 11:07:42 -05:00
lethosor 5a1e5e1464 Expose Units::casteFlagSet() 2015-12-19 11:07:35 -05:00
lethosor 15d3815f26 Merge remote-tracking branch 'quietust/develop' into develop 2015-12-19 10:58:38 -05:00
Lethosor a4e173270e Merge pull request #768 from TheBloke/compile_doc_improve
Compile.rst: major updates to Windows and OSX sections;
2015-12-19 10:58:36 -05:00
lethosor dec1d95cb6 travis: build docs 2015-12-19 10:55:35 -05:00
TheBloke 5b1e2ff01f Windows: soften the recommendation on Chocolatey to a 'preferred', also some improvements on the Chocolatey description re behaviour when software is already installed. And an update to the Manual Dependencies section. 2015-12-19 14:17:39 +00:00
lethosor ca29f60518 update xml 2015-12-18 23:09:27 -05:00
TheBloke 03ec774142 OSX: fixed wording on DF path 2015-12-19 02:39:03 +00:00
TheBloke 7bfeb7cb2b OSX: Removed dupe statement 2015-12-19 02:37:31 +00:00
TheBloke 895d5a534e Fixes to: Linux: gcc-multilib; OSX: 10.11 notes higher/more emphasised; Windows: reason for why SP1 is required (currently unknown, so downgraded to 'we do not support' rather than a specific reason why it won't work. 2015-12-19 01:59:23 +00:00
lethosor e7d8f9b2b3 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-12-18 18:42:39 -05:00
lethosor 55d5706a21 Update structures and fix various issues with plugins producing items
reaction_product::produce() takes a new unidentified vector<void*>*.
Passing a reference to an empty vector appears to work.
2015-12-18 18:40:11 -05:00
lethosor 347a112aa1 Add support for 11-argument function wrappers
Needed by item::addImprovementFromJob() as of 0.42:
dfhack/df-structures@f6361e2
2015-12-18 17:45:23 -05:00
Eric Wald 4dc94a565f Adjusting stockflow order numbers where possible.
Loading 0.40 saves in 0.42 results in a different list of reactions.  Fortunately, all but the instruments should still work.
2015-12-18 07:02:29 -07:00
Eric Wald 3c4bb6c7e3 Stockflow no longer needs to be singled out in the init file. 2015-12-17 22:13:32 -07:00
Eric Wald 45625318bb Stockflow reaction list repairs.
Mostly, instruments and their pieces are made through generated custom reactions, instead of as tools.
Depends on df-structures commit e551233 for full potency.
2015-12-17 22:02:30 -07:00
Eric Wald e4de341168 Preparing for MakeInstrument elimination.
Instruments are now made individually, so this type of job no longer happens.  Therefore, it will probably be removed from the job_type enum.
2015-12-17 21:45:43 -07:00
Ben Lubar 9bccf457c5 Check for ui_sidebar_menus being null before using it. 2015-12-17 10:54:19 -06:00
TheBloke e3b7cace60 Some re-wording in Building The Documentation, including some 80-char width (approx) re-formatting. 2015-12-15 22:04:10 +00:00
TheBloke 9bc8368d29 Further tweak to Enable documentation build re setting CMAke flag: mention GUI, update Windows advice. 2015-12-15 20:30:11 +00:00
TheBloke 6c7e5c9428 A few additions to the Windows section; more formatting changes including command highlighting; misc other tweaks. 2015-12-15 20:21:22 +00:00