d9917e9a1d
cxxrandom: remove pragmas, fix format warnings, misc. cleanup
2018-06-21 12:00:04 -04:00
7a5e7c7c86
Rename unit_flags1.dead to killed, update submodules/changelog
...
Follow-up for dfhack/df-structures#247
2018-06-21 11:17:09 -04:00
46b6bfd3f7
Merge remote-tracking branch 'suokko/fix_stocks_to_filter_military_items_1288' into develop
2018-06-21 00:04:06 -04:00
1deb6ab024
Update xml
2018-06-20 16:19:00 -04:00
b2fd0b062b
Merge remote-tracking branch 'PatrikLundell/dead_plugins' into develop
2018-06-20 16:18:07 -04:00
7fda8506f0
Merge remote-tracking branch 'suokko/cmake_option_to_enable_all_symbols' into develop
2018-06-20 16:16:03 -04:00
cdca28ddfa
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-06-20 12:10:52 -04:00
7036cc376b
Fix warnings in devel plugins introduced by #1302
2018-06-20 12:03:14 -04:00
706f3f9f4c
Add missing changelog entries from #1253
2018-06-20 11:50:26 -04:00
79860a61ad
Update changelog ( #1300 , #1302 )
2018-06-20 11:29:21 -04:00
6077a8ce4c
Merge remote-tracking branch 'suokko/printf_warnings' into develop
2018-06-20 11:25:14 -04:00
2f1d3c68c6
Merge remote-tracking branch 'suokko/stl_vsnprintf' into develop
2018-06-20 11:23:57 -04:00
5bfe4fd72b
Mention Lua API-only plugins in Plugins.rst
2018-06-20 11:22:21 -04:00
7f9270407f
Update other docs for cxxrandom/#1204
2018-06-20 11:17:05 -04:00
26427c2e43
Document cxxrandom in Lua API.rst ( #1204 )
2018-06-20 11:13:40 -04:00
862fa08ba6
Merge remote-tracking branch 'cppcooper/cxxrandom-rel' into develop
2018-06-20 11:00:43 -04:00
b9df6fae85
Update xml, authors
2018-06-20 10:51:24 -04:00
41f48bca7a
Changelog entry for item in stocpile check
2018-06-19 18:07:44 +03:00
bd0d36ec82
Fix stockpile inventory not to include inventory items
...
Inventory items have stale position information. The coordinates can be
very old if item is owned and continuesly carried for long time. The fix
checks if item is carried. To avoid filtering carried items that are
assigned (containers) to the stockpile the assignment needs to be
checked.
Fixes #1288
2018-06-19 18:06:28 +03:00
87e7c0f7aa
Add cmake configuration to select if stubs include symbols
...
G++ generates structure debug symbols for a few df namespace classes to
generated stub source files. I decided to test how much symbols from
those files would increase binary size. When the result was about double
size I decided to add cmake configuration option to let user easily
select if they prefer complete symbols or reduced size.
2018-06-19 16:16:38 +03:00
2c106fa7a5
Merge pull request #1311 from suokko/fix_loadstock_usable_1294
...
stockpiles: Fix unusable and usable loading for weapon and armor
2018-06-18 21:48:50 -04:00
bb577c070f
stockpiles load unusable and usable changelog entry
2018-06-14 22:27:13 +03:00
6f7ace1f6d
stockpiles: Fix unusable and usable loading for weapon and armor
...
Fixes #1294
2018-06-14 22:22:51 +03:00
ca744139f0
Update changelog ( #1309 )
2018-06-14 14:14:41 -04:00
1743ad70ab
Merge remote-tracking branch 'suokko/jsoncpp_int64' into develop
2018-06-14 14:13:28 -04:00
d35b6d468c
Remove /std:c++11 flag
...
MSVC doesn't actually support this
Also actually indent the "if" block
Ref #1301 , dfhack/df-structures#247
2018-06-14 13:46:39 -04:00
93a197b3d4
Update changelog for #1297 , #1307
2018-06-14 10:38:01 -04:00
808e795960
Document new Units API functions from #1297
2018-06-14 10:37:31 -04:00
aac892c560
Adapted to changed Units functions
...
Squashed version of #1307
Closes #1307
2018-06-14 10:30:35 -04:00
424028a0ae
jsoncpp: Fix (U)Int64 to long int on 64bit linux
...
Passing a 64bit integer to Json::Value fails to find matching. Even
tough long long int is also 64bits gcc considres long long int different
to long int. But fix can't be as simple as removing an long from type
because that would reduce 32bit builds to have only 32bit maximum int
size. But standard offers fixed width integer types that can be used to
get correct underlying type depending on platform.
2018-06-14 17:24:50 +03:00
cf780ce035
dead flag -> !isActive
2018-06-14 12:35:17 +02:00
cac749429a
dead flag -> !isActive
2018-06-14 12:34:41 +02:00
3be27a49b5
dead flag -> !isInactive
2018-06-14 12:33:18 +02:00
f076d00ede
dead flag -> !isActive
2018-06-14 12:32:38 +02:00
b38dfe2e43
dead flag -> !isActive
2018-06-14 12:31:52 +02:00
da0aa85b05
dead flag -> !isActive
2018-06-14 12:31:15 +02:00
aa361f3a0d
dead flag -> !isActive
2018-06-14 12:30:41 +02:00
6901c53bd5
dead flag -> !isActive
2018-06-14 12:29:48 +02:00
897a818f4c
Switch to Units functions
2018-06-14 09:42:45 +02:00
4cfdd7d92e
Check if second vsnprintf does something unexpected
2018-06-13 23:33:13 +03:00
ee3a726c29
Update changelog ( #1306 )
2018-06-13 16:15:57 -04:00
2c3300da1b
Merge remote-tracking branch 'suokko/start_script' into develop
2018-06-13 16:14:40 -04:00
284a842cef
Fix typo ( #1301 )
2018-06-13 16:09:38 -04:00
39194e5e38
Merge remote-tracking branch 'suokko/cxx14_enabling' into develop (actually c++11)
2018-06-13 16:08:41 -04:00
3167678dfc
Add #1299 to changelog
2018-06-13 16:04:47 -04:00
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
133dd8c83a
Merge remote-tracking branch 'suokko/ycm_defaults' into develop
...
Closes #1299
2018-06-13 15:50:34 -04:00
10e6016989
Merge branch 'units_dead' into develop
...
Closes #1297
2018-06-13 15:38:35 -04:00
51584c2d9e
Corrected isGhost
2018-06-13 15:37:45 -04:00
f329774059
dead & killed flag separation
...
squashed 4 commits from #1297
2018-06-13 15:37:45 -04:00
lethosor
Pauli
Lethosor
PatrikLundell