Commit Graph

8669 Commits (3cfff2114945974abc521c77e464c3f848d81a09)
 

Author SHA1 Message Date
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
lethosor 33302251c3 Update version to r5 2015-11-27 16:45:39 -05:00
lethosor 80556449a1 Improve Json::get() slightly 2015-11-27 16:45:26 -05:00
lethosor 55c4c8f103 Update news 2015-11-27 16:41:29 -05:00
lethosor 734d2c03db Fix several issues with gui/family-affairs
* Fix mismatched variable names
* Fix help display
* Remove redundant write to gamelog.txt
* Check for adulthood and fortress mode more reliably

See #730
2015-11-27 16:26:47 -05:00
lethosor 8ec232570b Fix some emigration issues
See #730
2015-11-27 16:12:34 -05:00
lethosor 485eddc54e JsonEx -> Json 2015-11-26 20:24:14 -05:00
lethosor 036c30fa68 Set BUILD_DOCS to OFF by default
See #738
2015-11-26 17:09:53 -05:00
lethosor c09eafcaf3 Fix fix/dry-buckets 2015-11-26 16:50:46 -05:00
lethosor 3783cbb672 feature.lua: Several improvements
* List names of features
* List some flags (water, magma, layer, etc.)
* Detect invalid IDs
* Remove =begin/=end from displayed help text
2015-11-26 16:41:45 -05:00
lethosor df61233774 Merge remote-tracking branch 'PeridexisErrant/new-scripts' into develop 2015-11-26 16:13:27 -05:00
lethosor 81b750c2f0 Merge remote-tracking branch 'Putnam3145/patch-22' into develop 2015-11-26 16:10:04 -05:00
lethosor 26abc5e915 Add script to check Authors.rst 2015-11-26 13:17:18 -05:00
lethosor 75f43b9bf6 Add @Enkrod to Authors.rst
Ref #743
2015-11-26 10:54:35 -05:00
Lethosor d18dae45d8 Merge pull request #743 from Enkrod/patch-2
Typo Restrictliquid fixed
2015-11-26 10:52:57 -05:00
lethosor 55397425ef Only call fix-job-postings automatically when workflow is enabled
Also, don't consider dead postings problematic
2015-11-26 10:34:46 -05:00
lethosor 2700b01765 Ensure that the correct job posting is kept (if there is one) 2015-11-25 23:35:19 -05:00
lethosor 428a0a4cfe fix-unit-occupancy: Handle invalid coordinates instead of crashing
It appears that positions of caged units brought by traders can be
invalid, in particular.
2015-11-25 22:32:54 -05:00
lethosor 597ed1510e Update documentation
Ref #741, #744, #747, #748, #749, #756
2015-11-25 20:56:30 -05:00
lethosor ff677d12ba Merge remote-tracking branch 'lethosor/confirm-lua' into develop 2015-11-25 20:41:07 -05:00
lethosor 1ed347240b Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-11-25 20:37:52 -05:00
lethosor 2aeac718cc workflow: Account for job postings correctly and fix existing issues
Without removing postings correctly, it was possible to end up with
multiple workers assigned to a job that workflow had suspended
multiple times, which caused crashes if more than one worker was
assigned to the same job by DF.

This adds an additional command, fix-job-postings, that runs
automatically when loading a world and fixes:
- Multiple job postings that point to the same job
- Job postings that point to a job where posting_index == -1
  (i.e. jobs that should have no posting assigned)

Fixes #741
2015-11-25 20:33:13 -05:00