lethosor
09f310767f
Update scripts
2016-06-14 19:46:13 -04:00
lethosor
53440a6f0d
Add scripts submodule
2016-06-14 19:43:06 -04:00
lethosor
6258870e2c
Remove scripts/ folder
2016-06-14 19:40:48 -04:00
lethosor
450fcdba31
Bump version to alpha1
2016-06-14 14:07:01 -04:00
lethosor
4f3a2b39d7
Update xml
2016-06-14 13:21:59 -04:00
lethosor
f07bc03c69
Update clsocket and Open()/Listen() usage
2016-06-14 13:21:51 -04:00
Lethosor
a2b2c66798
Merge pull request #931 from warmist/advfort2
...
Advfort2
2016-06-14 09:45:33 -04:00
Lethosor
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
lethosor
d51968f26e
Update xml
2016-06-13 17:12:16 -04:00
Michael Casadevall
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
Michael Casadevall
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
lethosor
f908a1d1b6
Replace catsplosion plugin with a script
...
Closes #938 , #722
2016-06-11 21:44:15 -04:00
lethosor
bcefb0205a
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-06-07 08:20:12 -04:00
lethosor
a47a1c83ba
Update xml, clsocket
2016-06-07 08:17:40 -04:00
Japa
8543121ece
add fog of war and traffic to probe.cpp
2016-06-03 00:32:11 +05:30
Japa
44b8433282
Make remotefortressreader.cpp mark blocks as hidden that aren't visible directly to the adventurer
2016-06-03 00:31:02 +05:30
Japa
b1072b65e4
Don't send designations in adventure mode
2016-05-31 22:53:48 +05:30
Japa
1e695ea308
Merge branch 'develop' of https://github.com/DFHack/dfhack.git
2016-05-31 18:53:22 +05:30
lethosor
fa1c589391
Update xml
2016-05-30 16:58:51 -04:00
lethosor
d44bc069ad
Merge remote-tracking branch 'BenLubar/thread-memory-leak' into develop
2016-05-30 16:24:42 -04:00
lethosor
9fc43cff4d
Make const method wrappers possible
...
Reverts ae3052f
Ref #935
2016-05-28 20:11:42 -04:00
Japa
3dcd3e14f0
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-05-28 21:24:02 +05:30
Japa
569325823d
Send world name and time with world center in remotefortressreader.cpp
2016-05-28 21:23:26 +05:30
lethosor
113325f885
update xml
2016-05-28 10:29:53 -04:00
lethosor
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
Japa
0867f3d311
Add dig designations to probe.cpp
2016-05-28 08:29:12 +05:30
Japa
c0419d919e
Add lake levels to remotefortressreader.cpp
2016-05-28 08:28:17 +05:30
lethosor
4d3df60470
Update xml (offsets)
2016-05-27 17:51:01 -04:00
lethosor
c1ba435058
Update version and xml
2016-05-27 17:41:23 -04:00
lethosor
700cb893ef
Merge remote-tracking branch 'BenLubar/knowledge-scholar-category-flag' into develop
2016-05-27 16:40:45 -04:00
Ben Lubar
e76258b040
knowledge category flag
2016-05-26 15:15:42 -05:00
Lethosor
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
lethosor
61bff2f668
Update 3rdparty/lethosor
2016-05-25 16:12:02 -04:00
Ben Lubar
fc311a8345
convert the key to a string so gm-editor doesn't error on vector elements
2016-05-24 13:26:16 -05:00
carbohydratesn
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
Warmist
726994969d
fixed a small bug
2016-05-22 22:54:51 +03:00
Warmist
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
Ben Lubar
bfe7a90ec0
add NOMINMAX to Windows.h includes
2016-05-21 19:54:20 -05:00
Ben Lubar
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
Warmist
6c64b3441d
Fixes to gui/advfort.lua
2016-05-20 13:55:59 +03:00
lethosor
dabf443260
Merge remote-tracking branch 'eswald/stockflow-43' into develop
2016-05-17 23:29:01 -04:00
lethosor
d93cf2cd2e
Update xml
2016-05-17 23:26:21 -04:00
lethosor
d198bf547a
Unit list search: reset cursor position to 0 before switching pages
...
On empty lists, pressing "up" sets the cursor position to -1. This results in a
crash if the list is populated, which the search plugin does before switching
pages.
Fixes #928
2016-05-17 23:23:54 -04:00
Eric Wald
3f0857bff3
Incrementing the manager order id properly.
...
There's a chance that not doing so could lead to a crash, somehow.
2016-05-16 19:48:52 -06:00
lethosor
a8f9f912c9
Merge remote-tracking branch 'eswald/stockflow-43' into develop
2016-05-16 20:40:50 -04:00
lethosor
b215204b2f
Merge remote-tracking branch 'eswald/workshop-profile-search' into develop
2016-05-16 20:32:51 -04:00
Lethosor
0124de9b66
Merge pull request #920 from PeridexisErrant/items-4301
...
Add new item descriptions for DF 43.01
2016-05-16 20:32:01 -04:00
Eric Wald
11a0bea002
Moving a search option to the bottom of the screen.
...
The list of workers in the workshop profile page can take nearly the full height of the screen.
2016-05-15 22:49:35 -06:00
Eric Wald
2df41e6bad
Clearing the active flag for new stockflow orders.
...
It's not entirely clear what this flag does when there aren't any conditions on the order, but new manual orders start as Ready instead of Active.
2016-05-15 22:06:20 -06:00
Eric Wald
0b1004f2b8
Notice resizing immediately, instead of on next key press
2016-05-15 09:14:30 -06:00