9de4550fde
Update submodules
2016-06-15 12:11:20 -04:00
150441ab25
Merge remote-tracking branch 'PeridexisErrant/instant-docs' into develop
2016-06-15 11:04:51 -04:00
cfc322fb7f
Improve handling of in-script documentation
...
Closes issue #823 . This allows for clean unification of html docs and
the in-terminal help text for scripts, including handling in core rather
than on a per-script basis (see issue #947 ).
2016-06-15 18:28:54 +10:00
e6d2f4ea2e
Move Contributing.rst for Github banner link
2016-06-15 18:28:54 +10:00
9da53a056e
Update scripts (devel/send-key)
2016-06-15 00:03:43 -04:00
e1b9186663
Update scripts (more documentation)
2016-06-14 23:55:34 -04:00
7156b3cfe2
Update scripts (documentation)
2016-06-14 23:42:51 -04:00
022a1bf9e8
Wrap script descriptions in `ls` output and remove description length cap
2016-06-14 21:24:27 -04:00
a947586cf0
Add @hayguen to Authors.rst (clsocket)
2016-06-14 20:16:14 -04:00
36d647a0de
Update scripts
2016-06-14 20:15:42 -04:00
09f310767f
Update scripts
2016-06-14 19:46:13 -04:00
53440a6f0d
Add scripts submodule
2016-06-14 19:43:06 -04:00
6258870e2c
Remove scripts/ folder
2016-06-14 19:40:48 -04:00
450fcdba31
Bump version to alpha1
2016-06-14 14:07:01 -04:00
4f3a2b39d7
Update xml
2016-06-14 13:21:59 -04:00
f07bc03c69
Update clsocket and Open()/Listen() usage
2016-06-14 13:21:51 -04:00
a2b2c66798
Merge pull request #931 from warmist/advfort2
...
Advfort2
2016-06-14 09:45:33 -04:00
9021fcab2e
Merge pull request #946 from NCommander/fix-produce-structure
...
Modify DFHack to handle new produce() prototype. Major thanks to leth…
2016-06-13 17:24:22 -04:00
d51968f26e
Update xml
2016-06-13 17:12:16 -04:00
90c7dc41ec
Update where library/xml to point to current master
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-13 17:10:58 -04:00
a03b32846a
Modify DFHack to handle new produce() prototype. Major thanks to lethosor, and ragundo for their help in this
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-13 16:57:45 -04:00
f908a1d1b6
Replace catsplosion plugin with a script
...
Closes #938 , #722
2016-06-11 21:44:15 -04:00
bcefb0205a
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-06-07 08:20:12 -04:00
a47a1c83ba
Update xml, clsocket
2016-06-07 08:17:40 -04:00
8543121ece
add fog of war and traffic to probe.cpp
2016-06-03 00:32:11 +05:30
44b8433282
Make remotefortressreader.cpp mark blocks as hidden that aren't visible directly to the adventurer
2016-06-03 00:31:02 +05:30
b1072b65e4
Don't send designations in adventure mode
2016-05-31 22:53:48 +05:30
1e695ea308
Merge branch 'develop' of https://github.com/DFHack/dfhack.git
2016-05-31 18:53:22 +05:30
fa1c589391
Update xml
2016-05-30 16:58:51 -04:00
d44bc069ad
Merge remote-tracking branch 'BenLubar/thread-memory-leak' into develop
2016-05-30 16:24:42 -04:00
9fc43cff4d
Make const method wrappers possible
...
Reverts ae3052f#935
2016-05-28 20:11:42 -04:00
3dcd3e14f0
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-05-28 21:24:02 +05:30
569325823d
Send world name and time with world center in remotefortressreader.cpp
2016-05-28 21:23:26 +05:30
113325f885
update xml
2016-05-28 10:29:53 -04:00
ae3052f79a
Make knowledge_scholar_category_flag::value() non-const
...
const methods can't be wrapped at the moment, at least without changing things
in DataFuncs.h
2016-05-28 10:28:22 -04:00
0867f3d311
Add dig designations to probe.cpp
2016-05-28 08:29:12 +05:30
c0419d919e
Add lake levels to remotefortressreader.cpp
2016-05-28 08:28:17 +05:30
4d3df60470
Update xml (offsets)
2016-05-27 17:51:01 -04:00
c1ba435058
Update version and xml
2016-05-27 17:41:23 -04:00
700cb893ef
Merge remote-tracking branch 'BenLubar/knowledge-scholar-category-flag' into develop
2016-05-27 16:40:45 -04:00
e76258b040
knowledge category flag
2016-05-26 15:15:42 -05:00
42c9cdbb81
Merge pull request #933 from BenLubar/gm-editor-vector-i
...
fix 'find id' shortcut in gui/gm-editor for vectors
2016-05-25 20:11:50 -04:00
61bff2f668
Update 3rdparty/lethosor
2016-05-25 16:12:02 -04:00
fc311a8345
convert the key to a string so gm-editor doesn't error on vector elements
2016-05-24 13:26:16 -05:00
9be928541c
Include math.h
...
3dveins.cpp won't build for me without math.h as a dependency - errors about 'fabsf' and other math functions
arch linux, gcc-multilib 6.1.1-1
2016-05-22 16:45:58 -04:00
726994969d
fixed a small bug
2016-05-22 22:54:51 +03:00
c985cd6f1d
Various changes to advfort.lua
...
Add explicit [fallback] option to the workshop jobs when sometimes the hacky way fails.
Fix brewing accepting too many items instead of barrel.
Fix tallow making reaction.
Add a limited display of item filters when adding items in a job slot.
2016-05-22 18:04:56 +03:00
bfe7a90ec0
add NOMINMAX to Windows.h includes
2016-05-21 19:54:20 -05:00
700392ba55
Fix tinythread memory leak in two ways:
...
1. update to tinythread version 1.1, which provides a detach method
2. move the thread disassociation to the join function, which allows
attached threads to be joined even after they finish (this was the main
leak)
Also update RemoteServer.cpp to detach threads and delete the thread
objects instead of leaking them (although they are much smaller than the
actual threads).
2016-05-21 19:17:08 -05:00
6c64b3441d
Fixes to gui/advfort.lua
2016-05-20 13:55:59 +03:00
lethosor
PeridexisErrant
Lethosor
Michael Casadevall
Japa
Ben Lubar
carbohydratesn
Warmist