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
lethosor
df4fb70be2
Provide more suggestions for unrecognized commands
2015-11-25 20:22:14 -05:00
Lethosor
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
Eric Wald
14cf2790d2
Falconne deserves credit for a few great plugins.
2015-11-25 17:51:30 -07:00
PeridexisErrant
7ed5a810b9
Improve fix/dry-buckets checks
2015-11-23 17:51:26 +09:30
lethosor
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
lethosor
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
lethosor
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
Putnam3145
c152b9033a
Add indeterminate orientation to gaydar
2015-11-17 09:58:04 -08:00
PeridexisErrant
1067eeb6d3
Improve drybuckets checks
...
Must also be liquid and in a container.
2015-11-17 16:52:06 +09:30
PeridexisErrant
842b9c5191
Implement feature as a script, add magma option
...
Functionality is exactly equivalent to the plugin, but with a new option
for players who want to enable magma furnaces without spoilers.
2015-11-17 16:43:56 +09:30
PeridexisErrant
2ba9ef04e3
Replace drybuckets plugin with a script
...
Also closes #248 , by checking job and building flags.
2015-11-17 13:55:43 +09:30
lethosor
9c4fc64ac5
Fix display issue in tweak max-wheelbarrow
2015-11-16 21:47:29 -05:00
lethosor
16b2140dec
Merge remote-tracking branch 'lethosor/fix-unit-occ-speed' into develop
2015-11-16 21:39:46 -05:00
Lethosor
140da9ff37
Merge pull request #746 from lethosor/gui-hooks
...
Support for hooking into GUI-related functions
2015-11-16 21:38:07 -05:00
lethosor
7ea0e198b3
fix-unit-occupancy: Only check unit list once
...
Fixes #749
2015-11-16 17:25:21 -05:00
lethosor
610170b0b0
Add hooks for getDwarfmodeViewDims and getDepthAt (new)
2015-11-15 11:54:34 -05:00
lethosor
1ff9277e12
Remove plugin export functionality (unused)
2015-11-15 11:54:34 -05:00
lethosor
fcfffd1cb6
Track state of gui hooks
...
Also fix a bug in drawborder() and expand color-dfhack-text to test
multiple hooks
2015-11-15 11:54:34 -05:00
lethosor
fff9072b07
Add initial support for hooking into Gui-related functions
2015-11-15 11:54:34 -05:00
lethosor
928bcb6d95
military search: Don't try to pass selection in empty list to DF
...
Fixes #748
2015-11-15 11:15:05 -05:00
lethosor
875ecf7827
Update Core::top_viewscreen before calling state change handlers
...
This was previously done right before SC_VIEWSCREEN_CHANGED events
were handled, meaning that code handling earlier events that used
top_viewscreen (rather than getCurViewscreen()) could refer to an
invalid viewscreen, i.e. in the tick after it was deleted.
Fixes #747
2015-11-14 21:48:51 -05:00
lethosor
9273c177c1
Add "confirm uniform-delete"
2015-11-11 23:14:58 -05:00
lethosor
07a310b0f2
Prevent "confirm squad-disband" from triggering unnecessarily
2015-11-11 23:14:30 -05:00
lethosor
e7c3b03ada
Misc. confirm plugin cleanup
...
This avoids the need to list newly-added classes in multiple places
(which could be extended to the search plugin) and gets rid of a few
ugly macros, along with a few other minor changes.
2015-11-11 23:00:20 -05:00