Commit Graph

8989 Commits (9d4d0b195a3fbf3c1e672deb0be87c81b9d0cd66)
 

Author SHA1 Message Date
lethosor 26427c2e43 Document cxxrandom in Lua API.rst () 2018-06-20 11:13:40 -04:00
lethosor 862fa08ba6 Merge remote-tracking branch 'cppcooper/cxxrandom-rel' into develop 2018-06-20 11:00:43 -04:00
lethosor b9df6fae85 Update xml, authors 2018-06-20 10:51:24 -04:00
Pauli 98b25e3462 Allow calling List:setChoices() to clear choices 2018-06-20 17:46:24 +03:00
Pauli 40469c6bef Changelog entry for List:setChoices change 2018-06-20 17:38:34 +03:00
Pauli ed23d2c4e2 Change gui.widgets.List:setChoices to keep state in internal table
Fixes 
2018-06-20 17:23:57 +03:00
Pauli a38aefbe44 Changelog entry for deramp fix 2018-06-20 15:54:31 +03:00
Pauli f90eebdd2d Add designation job check to deramp
Fixes 
2018-06-20 15:54:31 +03:00
Pauli 41f48bca7a Changelog entry for item in stocpile check 2018-06-19 18:07:44 +03:00
Pauli 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 
2018-06-19 18:06:28 +03:00
Pauli 9c59b7ff48 Fix unlikely memory leaks if Screen::show fails
The Screen::show takes ownership of the screen pointer. I decided to
switch the parameter to std::unique_ptr to make the pointer ownership
explicit. The unique_ptr then provides automatic screen destruction in
Screen::show unless pointer is inserted or is already in the linked list
that is managed by df.
2018-06-19 16:41:31 +03:00
Pauli 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
Lethosor f9de49283c
Merge branch 'develop' into check_jobs_on_mapcache_commit_1229 2018-06-18 21:50:14 -04:00
Lethosor 2c106fa7a5
Merge pull request from suokko/fix_loadstock_usable_1294
stockpiles: Fix unusable and usable loading for weapon and armor
2018-06-18 21:48:50 -04:00
Pauli bcf9387ce9 Only remove jobs that were created from a designation 2018-06-18 19:57:00 +03:00
JapaMala dc367f212e Move fortress mode control stuff into a different file. 2018-06-18 22:12:52 +05:30
JapaMala 6ef85908ac Bump df version 2018-06-18 21:28:56 +05:30
Pauli 7c94620282 Add changelog entry for designation fix 2018-06-18 16:42:29 +03:00
Pauli 1b5ec7ce69 Update jobs when committing MapCache changes
The map_block->designation.{dig,smooth} are reset to zeros when a job
posting is created for the designation. The job is then used to override
the designation state in the map_block. To make the new designation set
propogate to jobs the job structure would require updating. The update
would be possible a complex operation. The simple alternative is to
remove the job and let df create a new job in the next tick.

Fixes 
2018-06-18 16:34:09 +03:00
Pauli 6a151353e3 Use automatic return type for index_tile 2018-06-18 16:23:57 +03:00
Pauli bb577c070f stockpiles load unusable and usable changelog entry 2018-06-14 22:27:13 +03:00
Pauli 6f7ace1f6d stockpiles: Fix unusable and usable loading for weapon and armor
Fixes 
2018-06-14 22:22:51 +03:00
Pauli 540a4a18ac Changelog entry for jsoncpp update 2018-06-14 21:22:37 +03:00
Pauli 0bc2b3ab1b Update toSimpleString to use a the new builder API 2018-06-14 21:20:54 +03:00
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 ca744139f0 Update changelog () 2018-06-14 14:14:41 -04:00
lethosor 1743ad70ab Merge remote-tracking branch 'suokko/jsoncpp_int64' into develop 2018-06-14 14:13:28 -04:00
lethosor d35b6d468c Remove /std:c++11 flag
MSVC doesn't actually support this

Also actually indent the "if" block

Ref , 
2018-06-14 13:46:39 -04:00
lethosor 93a197b3d4 Update changelog for , 2018-06-14 10:38:01 -04:00
lethosor 808e795960 Document new Units API functions from 2018-06-14 10:37:31 -04:00
lethosor aac892c560 Adapted to changed Units functions
Squashed version of 

Closes 
2018-06-14 10:30:35 -04:00
Pauli 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
PatrikLundell cf780ce035 dead flag -> !isActive 2018-06-14 12:35:17 +02:00
PatrikLundell cac749429a dead flag -> !isActive 2018-06-14 12:34:41 +02:00
PatrikLundell 3be27a49b5 dead flag -> !isInactive 2018-06-14 12:33:18 +02:00
PatrikLundell f076d00ede dead flag -> !isActive 2018-06-14 12:32:38 +02:00
PatrikLundell b38dfe2e43 dead flag -> !isActive 2018-06-14 12:31:52 +02:00
PatrikLundell da0aa85b05 dead flag -> !isActive 2018-06-14 12:31:15 +02:00
PatrikLundell aa361f3a0d dead flag -> !isActive 2018-06-14 12:30:41 +02:00
PatrikLundell 6901c53bd5 dead flag -> !isActive 2018-06-14 12:29:48 +02:00
PatrikLundell 897a818f4c Switch to Units functions 2018-06-14 09:42:45 +02:00
Pauli 4cfdd7d92e Check if second vsnprintf does something unexpected 2018-06-13 23:33:13 +03:00
lethosor ee3a726c29 Update changelog () 2018-06-13 16:15:57 -04:00
lethosor 2c3300da1b Merge remote-tracking branch 'suokko/start_script' into develop 2018-06-13 16:14:40 -04:00
lethosor 284a842cef Fix typo () 2018-06-13 16:09:38 -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 3167678dfc Add to changelog 2018-06-13 16:04:47 -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 133dd8c83a Merge remote-tracking branch 'suokko/ycm_defaults' into develop
Closes 
2018-06-13 15:50:34 -04:00
lethosor 10e6016989 Merge branch 'units_dead' into develop
Closes 
2018-06-13 15:38:35 -04:00