Pauli
2b79b4cce7
Use jsoncpp 1.8.4 as a submodule
...
This makes jsoncpp a submodule that can be build directly from git
sources. This changes depends/jsoncpp to depends/jsoncpp-sub to avoid
filename conflict if someone tries to use git bisect.
jsoncpp library name changes to jsoncpp_lib_static.
jsoncpp version is the latest tagged release.
2018-06-14 21:20:46 +03:00
lethosor
aac892c560
Adapted to changed Units functions
...
Squashed version of #1307
Closes #1307
2018-06-14 10:30:35 -04:00
lethosor
39194e5e38
Merge remote-tracking branch 'suokko/cxx14_enabling' into develop (actually c++11)
2018-06-13 16:08:41 -04:00
lethosor
cddb1b59e1
title-version: move to bottom of options screen
...
This avoids overlapping the window border when a world is loaded
2018-06-13 15:57:13 -04:00
lethosor
de0521e618
title-version: add to options screen
2018-06-12 16:38:53 -04:00
lethosor
40d0d946a4
autogems: avoid crash with non-workshop links, add some logging
...
Also update changelog, including revflood change
Fixes #1303
2018-06-12 12:17:04 -04:00
Pauli
01abcb756e
Request c++14 support from compilers
...
All platforms seems to either have compiler supporting c++14. Windows
already requires msvc2015 that supports c++14 which should make it
minimal issue to require c++14 support from all compilers because gcc
is pretty easy to upgrade.
2018-06-10 23:15:33 +03:00
Quietust
8717144f14
Fix revflood bug, was revealing some tiles from below inappropriately
...
When scanning floor tiles from below, don't just leave them hidden, but
skip checking neighbors as well
2018-06-09 14:19:52 -06:00
lethosor
7e57450e78
Change buildingplan quality adjustment keys per #1284 comment, for consistency
2018-06-08 22:25:56 -04:00
lethosor
c4692b1c8d
Merge remote-tracking branch 'TotallyGatsby/buildingplanmax' into develop
2018-06-08 22:07:54 -04:00
lethosor
03968db344
Fix GCC warnings in 'tweak kitchen-prefs-all' and dev plugins
2018-06-01 10:02:38 -04:00
lethosor
f57327e7c8
Fix periodic events in several plugins
...
Also stop running buildingplan/fortplan while loading a world, and stop running
autogems while paused
Fixes #1286
2018-05-29 23:24:02 -04:00
Vitaly Pronkin
06b9dc0c1c
remove trailing spaces
2018-05-25 12:43:30 +12:00
Vitaly Pronkin
a44f5b57cb
don't need this
2018-05-25 01:34:57 +12:00
Vitaly Pronkin
0217916568
mousequery plugin with TWBT modifications
2018-05-25 01:07:12 +12:00
lethosor
e206a6d88b
mousequery: leave menus safely, without looping
...
Fixes #1285
2018-05-22 16:37:44 -04:00
lethosor
5f81cac3b7
dwarfmonitor.lua: use dmerror() consistently
2018-05-21 21:23:52 -04:00
Phillip Spiess
3e54a136fd
Use two keys for min/max
2018-05-20 20:50:42 -07:00
Phillip Spiess
385ac3f9f5
Add 'Max Quality' setting to buildingplan
2018-05-20 14:36:50 -07:00
lethosor
50a863a48e
Fix Kitchen.h include (case-sensitive)
2018-05-17 20:11:46 -04:00
lethosor
b551e70ffa
prospector: Avoid crashing due to invalid vein materials
...
Fixes #1276 , ref #1277
2018-05-17 19:56:48 -04:00
lethosor
759ba5c420
New tweak: kitchen-prefs-all
...
Options to toggle brew/cook for all listed items
Also fixed kitchen lua docs and moved kitchen search option
2018-05-17 19:47:56 -04:00
lethosor
17ba492992
Add some exclusion functions to Kitchen module, expose to Lua, fix build
2018-05-17 19:34:03 -04:00
lethosor
fa8a2fa670
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-05-17 00:12:59 -04:00
lethosor
79a0794658
Add kitchen preferences search
2018-05-17 00:11:52 -04:00
Japa
b6c6b4a8a0
Merge pull request #1252 from JapaMala/remote_reader
...
Bump RFR version number.
2018-05-17 07:48:18 +05:30
lethosor
c85274eb01
tweak max-wheelbarrow: fix conflict with building renaming
...
Reported by xordae on bay12:
http://www.bay12forums.com/smf/index.php?topic=164123.msg7762438#msg7762438
2018-05-16 16:51:45 -04:00
lethosor
0be16d4422
New tweak: stone-status-all
...
Adds an option to toggle the economic status of all stones
Also suggested by xq on IRC
2018-05-14 22:54:20 -04:00
lethosor
914b376082
Add stone status search
...
Suggested by xq on IRC
2018-05-14 22:30:21 -04:00
Ben Lubar
ee85ed4011
Remove $(NOINHERIT) from Stonesense
2018-05-14 00:56:18 -05:00
Ben Lubar
f838b5695d
Remove $(NOINHERIT) which was inexplicably included in a bunch of plugins.
2018-05-14 00:12:22 -05:00
lethosor
06031bdd0e
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-05-13 13:11:29 -04:00
lethosor
e2cd1fca58
Reorder dfhack-md5 GCC flags, fix another embark-assistant warning
2018-05-13 13:09:51 -04:00
Ben Lubar
586051510c
Update stonesense.
2018-05-13 10:38:59 -05:00
lethosor
016dab3990
Fix more warnings, including stonesense
2018-05-12 22:10:07 -04:00
lethosor
e9ec08f419
Add Buildings::getRoomDescription(), moved from search plugin, +cleanup
2018-05-12 17:00:21 -04:00
lethosor
7d0df117ee
dwarfmonitor: fix typo in function name
2018-05-12 14:59:26 -04:00
lethosor
ad518faeec
cursecheck: Replace setUnitNickname (older) with Units::setNickname
2018-05-12 14:59:04 -04:00
lethosor
c15571caa0
Move isRouteVehicle, isSquadEquipment from workflow to Items module
2018-05-12 14:49:30 -04:00
lethosor
abb903d28f
command-prompt: support getSelectedPlant()
2018-05-12 13:02:52 -04:00
lethosor
a34b34d3cb
Move a few item functions from autotrade/stocks into DFHack::Items
2018-05-12 12:04:46 -04:00
Lethosor
fbe652d7a0
Merge pull request #1265 from db48x/allow-calling-blueprint-from-lua
...
this allows the blueprint plugin to be called from lua
2018-05-11 23:52:16 -04:00
lethosor
018deec912
Fix another occasional segfault in block-labors
...
Fixes #1057
2018-05-11 22:18:26 -04:00
lethosor
9d353c1ea7
tweak block-labors: fix crash if unit is null
...
Fixes #1057
2018-05-11 10:21:05 -04:00
Ben Lubar
58636f5a27
Make 32-bit Linux builds also check for undefined symbols.
2018-05-10 11:20:19 -05:00
lethosor
8e76c612f6
Add SDL to RFR libs on Linux
2018-05-09 21:48:27 -04:00
lethosor
77ee74be50
Only require symbols to be defined in plugins
...
Core uses some unresolved symbols on Linux
2018-05-09 21:36:51 -04:00
Daniel Brooks
a550c81628
update the CMakeList to link the blueprint plugin against the lua library
2018-05-09 18:25:26 -07:00
Daniel Brooks
b127522992
Merge branch 'develop' into allow-calling-blueprint-from-lua
2018-05-09 12:55:17 -07:00
lethosor
2ada907420
Move stockpiles option (load/save) below stocks/autodump/etc
...
Fixes #1161
2018-05-09 10:33:41 -04:00