571df39878
Update submodules
2015-12-11 16:35:42 -05:00
817ea5e01c
Add new labors to autohauler/autolabor
2015-12-09 20:03:35 -05:00
7e9d6fba86
Update xml
2015-12-09 20:03:14 -05:00
448e367d4d
Update xml
2015-12-08 17:32:13 -05:00
a3d6d16757
Update xml
2015-12-07 17:14:46 -05:00
02d2405d1f
Update xml
2015-12-07 16:34:47 -05:00
49ad153d4b
Update xml
2015-12-06 17:12:46 -05:00
3b2ace95f8
Make SDL_UpperBlit hook check core status first
2015-12-05 20:07:54 -05:00
e720c498c9
Bump to 0.42.02
2015-12-05 17:57:52 -05:00
28336d4346
Disable stockflow and show warning in example init
2015-12-04 23:13:12 -05:00
b63270162d
Update xml
2015-12-04 23:12:49 -05:00
1668984585
UNITJOB_VIEW -> UNITJOB_VIEW_UNIT
2015-12-04 23:12:37 -05:00
7a69b90277
Update xml
2015-12-02 16:27:51 -05:00
f9af5a71d6
Bump to 0.42.01-r0
2015-12-01 17:36:44 -05:00
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
4382198de4
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-11-29 18:40:08 -05:00
7aca0aa7b1
Clean up, update .gitignore
2015-11-29 18:39:48 -05:00
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
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
23a5ce69bf
Send unit names over remotefortressreader
2015-11-29 00:03:26 +05:30
33302251c3
Update version to r5
2015-11-27 16:45:39 -05:00
80556449a1
Improve Json::get() slightly
2015-11-27 16:45:26 -05:00
55c4c8f103
Update news
2015-11-27 16:41:29 -05:00
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
8ec232570b
Fix some emigration issues
...
See #730
2015-11-27 16:12:34 -05:00
485eddc54e
JsonEx -> Json
2015-11-26 20:24:14 -05:00
036c30fa68
Set BUILD_DOCS to OFF by default
...
See #738
2015-11-26 17:09:53 -05:00
c09eafcaf3
Fix fix/dry-buckets
2015-11-26 16:50:46 -05:00
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
df61233774
Merge remote-tracking branch 'PeridexisErrant/new-scripts' into develop
2015-11-26 16:13:27 -05:00
81b750c2f0
Merge remote-tracking branch 'Putnam3145/patch-22' into develop
2015-11-26 16:10:04 -05:00
26abc5e915
Add script to check Authors.rst
2015-11-26 13:17:18 -05:00
75f43b9bf6
Add @Enkrod to Authors.rst
...
Ref #743
2015-11-26 10:54:35 -05:00
d18dae45d8
Merge pull request #743 from Enkrod/patch-2
...
Typo Restrictliquid fixed
2015-11-26 10:52:57 -05:00
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
2700b01765
Ensure that the correct job posting is kept (if there is one)
2015-11-25 23:35:19 -05:00
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
597ed1510e
Update documentation
...
Ref #741 , #744 , #747 , #748 , #749 , #756
2015-11-25 20:56:30 -05:00
ff677d12ba
Merge remote-tracking branch 'lethosor/confirm-lua' into develop
2015-11-25 20:41:07 -05:00
1ed347240b
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-11-25 20:37:52 -05:00
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
df4fb70be2
Provide more suggestions for unrecognized commands
2015-11-25 20:22:14 -05:00
be111dedbd
Merge pull request #759 from eswald/falconne-credit
...
Falconne deserves credit for a few great plugins.
2015-11-25 20:09:39 -05:00
14cf2790d2
Falconne deserves credit for a few great plugins.
2015-11-25 17:51:30 -07:00
9ac9ff15a2
Ensure event_loop will be disabled
2015-11-24 16:59:15 +09:30
7ed5a810b9
Improve fix/dry-buckets checks
2015-11-23 17:51:26 +09:30
af92b3ae1f
Fix some confirm plugin issues and add a simple configuration UI
...
- Detect null pointers in trade-related functions
- Fix typo/issues pointed out by @dscorbett
- Reorder includes
2015-11-21 20:58:49 -05:00
b7dd93b6e8
Implement most of the confirm plugin in Lua
...
This should make resolving future issues easier, although implementing
new confirmations in lua isn't possible yet (each one requires a line
in confirm.cpp).
This also resolves an issue with note-delete and route-delete, with
dfhack/df-structures@1bc4f61
2015-11-21 19:01:35 -05:00
e0346ede56
Merge gamelog scripts to modtools/extra-gamelog
2015-11-18 17:59:34 +09:30
67aed56183
Allow adding plugins temporarily without modifying plugins/CMakeLists.txt
...
Useful to avoid issues when switching between branches that modify
plugins/CMakeLists.txt
2015-11-17 17:42:03 -05:00
lethosor
Lethosor
TheBloke
Japa
Eric Wald
PeridexisErrant