Update to master #13

pallet, overmap_terrain, item_groups, multitile_city_buildings entries

Adds 2nd story and more work on the roof

update per review Co-Authored-By: Alexey Mostovoy <amurkin1988@yandex.ru>

update per review

Add description to furniture.json

Co-Authored-By: matskuman5 <selinmatias5@gmail.com>

For clang-4 we use the Trusty source on Xenial. For clang-5 that trick doesn't work, so we retain the Trusty host.

This was setting CXXFLAGS and LDFLAGS, when it should have been appending to them. Without this, Travis builds will fail because they can't disable warnings on old compilers.

These two Travis builds were installing 32-bit libraries, for which there should be no need.

Document constructions and remove time constant

Refresh Travis builds

Add fire barrels

moved memorial out of player into the new avatar class

Logic that determines if a martial arts style is learned each turn is controlled by json instead of hardcoded.

* Fix missing declarations Mark functions with no prior declarations as static, and remove the unused ones. * Move debug_is_safe_string definition Put it inside !WIN32 since it's only used there.

Have fixed all warnings for this check.

This was only present in the tests, contained undefined behaviour, and was obsolete.

This gives control over where the tests write files, which allows parallel test runs to be performed without stepping on each other's toes.

Now the tests can run in parallel, have one of them write to a different location to avoid failures due to filesystem race conditions.

Allows the player to use clean water to make makeshift steam engines.

per feedback

typo!

There are two acorn_roasted entries in this file. The one removed is defined prior to the itype it copies from (acorns). The remaining entry is immediately following the definition of acorns, and can be loaded without being deferred.

…g gods.

…operator_result Still yet more clang-tidy checks

Avoid parallel test failures due to filesystem races

Changed weight and volume values of the ferromagnetic rail ammo to be more realistic.

Replaced battery spawn with full pocket batteries in bandit_tower

Moved martial arts autolearn code to json

Saving some future person a bunch of time

Add clean water to makeshift steam engine recipe

…y-from Fix copy-from for overmap specials

* start conditional panel update infrastructure * Revert "Remove unnecessary `draw_panels()` calls" This reverts commit 2db3b84. * Revert "Only draw panels on first entry into game::get_player_input()" This reverts commit d629d93. * commit include file change * preserve panel spacing (so minimap draws in right location) * comments are fun. * adjust draw_panels invocations to force redraw when appropriate * cleanup of things that shouldn't have been reverted

* Added charged phone group. * Removed initial_charges from cell phone * Began the work Added a proper item template to everyone who needs a charged cell phone starting out. This is gonna suck... * First pass on professions.json * Fixed professions.json * Fixed the mods too! * Removed initial_charges from creepy_doll and talking_doll * Update data/json/professions.json Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com> * Update data/json/professions.json Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com> * Modified home_mechanic to have a charged phone They didn't really need it, but I did it for consistency.

* Add precise versions for Windows systems. * Add Android system version retrieval. * Simplify formatting for Windows version. * Add Linux system version. * make operating_system_version() return '<unknown>' if the version can't be determined. - Invert condition on Linux version function; * Simplify Android version retrieval. * Extract shell execution function. - will be reused by Linux, Mac and BSD. * Add MacOS system version. * Sort methods alphabetically. * Add BSD version retrieval. * Fix structure init. Fix error in macos function. * Fix typo in output...

* nervous sytem modules * motor system * structural system * tank tread * ai core * more AI cores * Uncraft Robots * gun fix * uncraft nursebot * uncraft turret * inactive turrets recipe * manhack recipe * uncraft hazmatbot * Add schematics for bots * schematics item group * item_groups fro schematics * recipe for every bot * uncraft modules * add self_monitoring_module to nurse and cleaner bots * Damage overflow from a robot is transfered to its corpse * sane crafting time * flavor on robot death * can't repair broken robot items * electronics is used skill, mechanics is required

…roof Add mall 2nd floor and more roof

* Added AT4 to guns_launcher_rocket itemgroup * Add AT4

move stomach, guts, and other minor things into Character

* fix uninstall typos

These cases seem reasonable as is.

This one could have iterated one more time than intended due to floating point rounding issues (actually it couldn't because the loop was up to at most 20, but still...).

Have fixed all the warnings for this one.

This warning helps keep code tidy and comprehensible by ensuring functions local to a single file are marked static, and get removed when no longer used. It also helps the optimizer reason about the code.

Ensure that only the ones being used get compiled.

- Move avatar-specific savegame code to `avatar::store()` and `avatar::load()`. (This code was left behind when migrating from player.) - Make several variables in player protected to allow access from `avatar::store()` and `avatar::load()`. This is just a temporary fix until these variables are migrated to the avatar class. - Do some reorganization of savegame_json.cpp to make it easier to understand the hierarchy of functions.

Add -Wmissing-declarations

The last of the clang-tidy static analyzer checks

Strip carriage returns from player memorial log lines on read

Fix missing type in variable declaration for Android.

DeadPeople tileset update

* adds new fences, shallow pool water * spawn counter gate, add missing entry * update pool description

* Prevent a cast warning with gcc-based compiler for the Windows build. * Add `static const` to string vectors.

Fix battery spawn in bandit tower

* Extented descriptions for terrain and furniture Fixes this issue: #28497 I didn't extensively add a description for every single thing, but did many including all of the listed items in that issue and many more interactive tiles. * Fixed TAB to Space and added a few more Silly mistake, won't happen again. Added a few more descriptions while I was at it. * Update data/json/furniture.json Yeah, there's probably a few mistakes like that. Thanks Co-Authored-By: DSeyka <34726992+DSeyka@users.noreply.github.com> * Update data/json/furniture.json Co-Authored-By: DSeyka <34726992+DSeyka@users.noreply.github.com> * Fixed typo in ICBM line * Another tweak to those ICBM lines I know it's not ideal to make changes here, but hey. Improvement. * lint fix sorry * reverted locker * Update data/json/furniture.json Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * Update data/json/furniture.json Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * croaker frog fix * Update data/json/furniture.json Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * Update data/json/furniture.json Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * Update data/json/furniture.json Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * the spider update * Update data/json/furniture.json Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * Update data/json/furniture.json Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * Update data/json/terrain.json Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * Update data/json/terrain.json Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * Update data/json/terrain.json I like it. Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * centrifuge and radio tower * exercise machine > > > However, in consideration for translators (which may not be an issue but I tend to err on caution as I _don't_ speak [non-SVO languages](https://en.wikipedia.org/wiki/Subject%E2%80%93verb%E2%80%93object)), it's typically better to avoid too much slang/informal writing as it can be difficult to convey in other languages accurately. Yeah, well, considering this, many of my descriptions are screwed then. :) Anyway, thanks for the lesson. Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * ball machine genericize plus decon Co-Authored-By: DracoGriffin <32253888+DracoGriffin@users.noreply.github.com> * I-am-Erk's suggestions * I-Am-Erk's suggestions * sewage pipe * missed a spot * Trying to manually rebase * mainua rebase terrain

Fix astyle regression (2019-05-24)

also move item groups

…cs (#29485) * electrical damage has a chance to temporarily incapacitate bionics * added BIONIC_SHOCKPROOF, shockproof and faulty bionics cant be incap'd

) * Change handmade carbine to accept factory-made magazines as well

…ne (#30355) * Create BEGGAR_1_Reena_Sandhu.json * Remove beggars from classes_uncommon.json They will be defined in individual character entries now. * Expand Luo's dialogue significantly You can insult her! Now I need to program in her apology. * Complete all Luo dialogue for this pass Now you can bring her a mushroom * Add another way to find out luo has a phd requires int or per, lets me complete this without adding dialogue for beggars 2/4/5

* Adjust coverage of Travis builds Attempt to get in all the configurations we really care about in PR tests. Max and Min versions of supported compilers. A mix of Curses and Tiles/Sound builds. A mix of Make and CMake builds. Localization disabled. The most popular (Tiles/Sound) Mac and Windows builds. Address sanitization enabled on latest GCC and Clang. Clang-tidy build. Finally, round out all the remaining supported compiler versions only on master builds, along with the somewhat obscure Mingw-w64 Terminal build. * Fix clang 8 install * Outline travis build target strategy Taken from #30761 * Add a new build stage

add roof to tire shop

The previous, more generous filter would report issues in SDL headers in some cases.

Set clang-tidy header filter

…rors Make free functions static to suppress missing declarations errors

For consistency and clarity.

Merging #30759 broke the build by introducing a compile failure in chkjson. This should be built on Travis to allow detection of such issues. Previously chkjson was only built on Jenkins, but that doesn't happen when the Makefile changes, so this problem went undetected.

The pragma-based solution would be even more messy if made to work on all gcc versions.

Try union workaround to function cast warning

ignore some warnings in visual studio

Build chkjson on Travis

Replace typedef with using

For consistency in typedef vs using.

clang-tidy: Enable modernize-use-using

* move create(), randomize(), load_template() to avatar * change u to you in set_description

* generate_changelog: remove duplicated token code * generate_changelog: move function * generate_changelog: add more threading * generate_changelog: fix missing space * generate_changelog: let by-build and by-date be generated in a single run * generate_changelog: remove two leftover functions * generate_changelog: improve "by-build" logic * Load "Last Hash" for all builds that actually have that attribute in the Jenkins API (previously it was loaded only for "SUCCESSFUL" builds) * Avoids ignoring "FAILED" builds on output, they usually fail only for some specific platforms. Players and devs may care about them. * Instead we make sure we always have the "Last Hash" for the builds to show on the output, which is what we actually use to match builds to pull requests. * generate_changelog: fix when requesting only by_build * generate_changelog: avoid copy/paste code for validation * generate_changelog: avoid long lines * generate_changelog: add more calls to exit_on_exception * generate_changelog: make --flatten output more consistent * generate_changelog: reword slightly misleading log message * generate_changelog: add a silly argument validation * generate_changelog: add extra debug message for Jenkins API

Add missing conversion from std::string to char*.

* Added new martial art buff events Adds onmiss, oncrit and onkill buff events.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to master #13

Update to master #13

Commits on May 19, 2019

Commits on May 20, 2019

Commits on May 21, 2019

Commits on May 22, 2019

Commits on May 23, 2019

Commits on May 24, 2019