Commit Graph

14540 Commits (cf0b87fbc463b0c5f65b4b16dc8134d991598a7f)
 

Author SHA1 Message Date
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
TheBloke 196aec4cb4 + again 2015-12-15 18:51:37 +00:00
TheBloke 2ded0e5ea9 Github->GitHub; git->Git (where not a command); one more change to Perlbrew section 2015-12-15 18:50:59 +00:00
TheBloke e1777fcc6b OSX: Simplify the new local Perl section, just mention what perlbrew as it's obvious enough how to use it from the webpage and most people probably won't be interested anyway. 2015-12-15 14:16:51 +00:00
TheBloke 417f9a26aa Minor bullet point fixes in Mac list 2015-12-15 07:06:23 +00:00
TheBloke 1f928a8292 Typo 2015-12-15 06:16:48 +00:00
TheBloke 1afc0afb9c Some further fixes, updates and elaborations. Had to convert the Mac list to bullet rather than numbered, as HTML numbering keeps breaking (resets to 1 in the middle of the list in several places) for reasons I can't figure out. 2015-12-15 06:08:25 +00:00
TheBloke f26982f1e9 And other minor fixes (actually in this commit this time.) 2015-12-15 04:11:39 +00:00
TheBloke 5aae535394 Building documentation section: now with a non-stupid way of doing it! And other minor fixes. 2015-12-15 04:10:00 +00:00
TheBloke 21631b3712 Compile.rst: major updates to Windows and OSX sections; minor to Linux; new section re compiling documentation; many small fixes.
Introduction.rst: fix typo and remove erroneous end version for OSX.
2015-12-15 03:30:08 +00:00
Ben Lubar 80ec5ab043 vim-style +-args. for example, "./dfhack +echo foo" would be equivalent to running ./dfhack and then typing "echo foo" into the console. uses shell argument splitting, so "./dfhack +somecommand 'foo bar' baz" does the right thing. See DFHack#755. 2015-12-13 14:03:25 -06:00
Lethosor 8a347db615 Merge pull request #766 from BenLubar/benlubar-parens
add parentheses around || that should be inside &&
2015-12-13 13:47:44 -05:00
Ben Lubar 270ff61fbd add parentheses around || that should be inside && 2015-12-13 12:23:56 -06:00
Quietust 7ef815afa8 apparently, casteFlagSet is a static function, despite its usefulness... 2015-12-12 17:58:58 -06:00
Quietust eb1092da6e Update strangemood plugin according to actual game code 2015-12-12 13:46:35 -06:00
lethosor 3083b01525 Add new labors to manipulator 2015-12-12 11:26:45 -05:00
lethosor 78d6b92127 Change strangemood permitted skill checks to job checks
permitted_skills was removed in 0.42 (dfhack/df-structures@6e2e8731)
2015-12-12 11:17:00 -05:00
lethosor 1329acc516 Update xml 2015-12-11 20:34:48 -05:00
lethosor 83603fcf45 Add prerelease build flag and warning script 2015-12-11 20:27:46 -05:00
lethosor a73110f7f0 startdwarf: Provide feedback if offset is missing 2015-12-11 16:36:09 -05:00
lethosor 571df39878 Update submodules 2015-12-11 16:35:42 -05:00
lethosor 817ea5e01c Add new labors to autohauler/autolabor 2015-12-09 20:03:35 -05:00
lethosor 7e9d6fba86 Update xml 2015-12-09 20:03:14 -05:00
lethosor 448e367d4d Update xml 2015-12-08 17:32:13 -05:00
lethosor a3d6d16757 Update xml 2015-12-07 17:14:46 -05:00
lethosor 02d2405d1f Update xml 2015-12-07 16:34:47 -05:00
lethosor 49ad153d4b Update xml 2015-12-06 17:12:46 -05:00
lethosor 3b2ace95f8 Make SDL_UpperBlit hook check core status first 2015-12-05 20:07:54 -05:00
lethosor e720c498c9 Bump to 0.42.02 2015-12-05 17:57:52 -05:00
lethosor 28336d4346 Disable stockflow and show warning in example init 2015-12-04 23:13:12 -05:00
lethosor b63270162d Update xml 2015-12-04 23:12:49 -05:00
lethosor 1668984585 UNITJOB_VIEW -> UNITJOB_VIEW_UNIT 2015-12-04 23:12:37 -05:00
lethosor 7a69b90277 Update xml 2015-12-02 16:27:51 -05:00
lethosor f9af5a71d6 Bump to 0.42.01-r0 2015-12-01 17:36:44 -05:00
lethosor 8b406cc0b3 Make a separate copy of DF's SDL library to link against on OS X
Linking to any library with ".framework" in its path on OS X causes
that directory to be included in the include path (with -F), which
causes all of the DFHack core to be rebuilt unnecessarily when
changing DF folders.
2015-12-01 17:35:39 -05:00
lethosor 4382198de4 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-11-29 18:40:08 -05:00
lethosor 7aca0aa7b1 Clean up, update .gitignore 2015-11-29 18:39:48 -05:00
Lethosor 46fba6c96f Merge pull request #764 from TheBloke/gcc5_enable
Re-enable GCC 5 compilation for OSX and Linux
2015-11-29 12:02:12 -05:00
TheBloke d84f5f1e52 Re-enable GCC 5 compilation for OSX and Linux, passing -D_GLIBCXX_USE_CXX11_ABI=0 to disable new C++11 name mangling and remain compatible with DF. 2015-11-29 14:26:11 +00:00
Japa 23a5ce69bf Send unit names over remotefortressreader 2015-11-29 00:03:26 +05:30