Merge pull request #14 from CleverRaven/master

Bring me up to date

.github/CONTRIBUTING.md

@@ -179,6 +179,10 @@ The "???" is the issue number. This automatically closes the issue when the PR i
 
 See https://help.github.com/articles/closing-issues-using-keywords/ for more.
 
+## Tooling support
+
+Various tools are available to help you keep your contributions conforming to the appropriate style.  See [the relevant docs](../doc/DEVELOPER_TOOLING.md) for more details.
+
 ## Advanced Techniques
 
 These guidelines aren't essential, but they can make keeping things in order much easier.

.gitignore

@@ -68,6 +68,9 @@ Cataclysm.exe.lastcodeanalysissucceeded
 #Visual Studio 2017
 /msvc-full-features/PredictedInputCache_Debug_x64.dat
 
+# PVS Studio
+/msvc-full-features/*PVS-Studio*
+
 # Temporary and backup files
 *.bak
 *.cbTemp

.travis.yml

@@ -48,17 +48,15 @@ jobs:
           packages: ["g++-8",   "g++-8-multilib",   "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
           sources: *apt_sources
 
-      # MXE variants disabled while pkg.mxe.cc is down
+      # MXE variants using alternate repository http://mirror.mxe.cc/repos/apt
       # GCC MinGW
     - env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine'
-      if: type = disabled
       addons: &gcc
         apt:
           packages: ["wine"]
 
     # Windows Tiles
     - env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine' TILES=1 SOUND=1
-      if: type = disabled
       compiler: gcc
       addons: &gcc
         apt:
@@ -161,7 +159,7 @@ jobs:
           sources: [*apt_sources, llvm-toolchain-trusty-5.0]
 
     # Clang 6.0
-    - env: CLANG=clang++-6.0 CXXFLAGS=-Wno-error=unused-command-line-argument SANITIZE=address
+    - env: CLANG=clang++-6.0 CXXFLAGS=-Wno-error=unused-command-line-argument SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items"
       dist: trusty
       compiler: clang
       addons: &clang60

build-scripts/build.sh

@@ -6,7 +6,7 @@ set -ex
 
 function run_tests
 {
-    $WINE "$@" -d yes -r cata --rng-seed time
+    $WINE "$@" -d yes -r cata --rng-seed time $EXTRA_TEST_OPTS
 }
 
 if [ -n "$CMAKE" ]

build-scripts/requirements.sh

@@ -10,10 +10,8 @@ fi
 
 # Influenced by https://github.com/zer0main/battleship/blob/master/build/windows/requirements.sh
 if [ -n "${MXE_TARGET}" ]; then
-  echo "deb http://pkg.mxe.cc/repos/apt/debian wheezy main" \
-    | sudo tee /etc/apt/sources.list.d/mxeapt.list
-  travis_retry sudo apt-key adv --keyserver x-hkp://keyserver.ubuntu.com:80 \
-    --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB
+    sudo add-apt-repository 'deb [arch=amd64] https://mirror.mxe.cc/repos/apt xenial main'
+    travis_retry sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 84C7C89FC632241A6999ED0A580873F586B72ED9
   # We need to treat apt-get update warnings as errors for which the exit code
   # is not sufficient.  The following workaround inspired by
   # https://unix.stackexchange.com/questions/175146/apt-get-update-exit-status/
@@ -34,6 +32,6 @@ fi
 
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   brew update
-  brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ncurses lua coreutils
+  brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ncurses lua
   brew link --force gettext ncurses
 fi

data/changelog.txt

@@ -1,4 +1,4 @@
-# 0.D (2018-12-01)
+# 0.D (2019-01-01)
 
 ## Features:
 
@@ -169,7 +169,24 @@ Update the fireman belt to allow attachments from fire axes, war hammers, and ma
 Adds stealth modifier as JSON-ized mutation property.
 npctalk: add support for NPC backstories.
 npctalk: NPC group commands to guard and follow.
-npc: Warn the player about dangerous monsters.
+NPCs can hear monsters and warn the player about them.
+NPC: Warn the player about dangerous monsters.
+Background traits - framework for dialogue update.
+Adds expertise traits for NPCs.
+Faction camp clearcutting mission.
+Allow aiming anywhere. Mark practice target.
+Vehicles: add multiple fuel support.
+Add blind throwing.
+Overhaul of map revealing items.
+Allow peeking z levels.
+Allow custom sprites for corpses.
+Makes monster corpses the same weight and volume as defined in the json files.
+Favorite ammo location for RELOAD_AND_SHOOT and RELOAD_ONE weapons.
+Vehicles: increase effective speed in tiles per turn.
+Adds a corpse to gibbed creatures.
+Selfies can be made and stored on camera.
+NPC photos show visible mutations.
+Enable Loot Zones to bind to vehicle Cargo parts.
 
 ## Content:
 
@@ -287,6 +304,22 @@ Implementation to support use of JSON snippets for procedural music descriptions
 Adds LivePeople Tileset.
 Add forest trails.
 Add new pond map extra.
+Added railroad overmap terrains.
+Add new offal recipes in the game using the new offal types.
+Adds sourdough bread and sourdough starter.
+Add trail guide item.
+Adds a way to craft anesthetic kits in the game.
+Explosion of NPC dialogue.
+NPC Dialogue: role-specific survivor stories.
+Adds formaldehyde and methanol as precursors for hexamine, and recipes to make them.
+Adds shanty-town walls comprised of bolted-together junk.
+Adds extra recipe for nitric acid, which requires a pressure cooker and a platinum grille as a catalyst.
+Adds lab nanofabricator finale, letting players create high tech items.'
+Update RetroDaysTileset to include RetroDaysJar, AdamRetroDays, long grass
+Mainline NPC traits mod.
+Added outbuildings to default farm.
+Regularize city grid and allow large in-city specials.
+Adds area_name into info box when looking_around.
 
 ## Interface:
 
@@ -513,6 +546,21 @@ Prevent seeing light through walls.
 Make walls sensibly visible at night.
 Have vehicles become dark inside when that makes sense.
 Allow toggling display of forest trails on the overmap.
+Added 'center' action for look around mode.
+Vehicle: display engine power and electrical drain/production.
+Bandage/Disinfactant display/compare/apply improvements.
+Allow hiding of recipe categories from crafting menu.
+Player: don't create the reload prompt if there's only one option.
+Better scrolling through requirements list in crafting GUI.
+Improve info for worn items which cover nothing.
+Show how much water and cleanser will be required on washing UI.
+Basecamp: store food supply in calories.
+Missions: display name of NPC that gave the mission.
+Automatically choose infinite sources for crafting when available.
+Play Now! loads a world with 0 character if available.
+Crafting-gui - colorize book enumeration.
+Veh_interact.cpp - colorize cargo volume.
+Sounds: add descriptions to player shouts.
 
 ## Mods:
 
@@ -572,6 +620,8 @@ Added Fuji's Struct mod.
 Salvaged Robots mod.
 Partially moved Folding Parts Mod to base game.
 Convert Bright Nights region_settings to region_overlay.
+Added anthill, bee, and large zombie exclusion mods.
+MSX Dead People tileset update and make it default.
 
 ## Balance:
 
@@ -739,6 +789,12 @@ Let one screwdriver recipes produce screwdriver set.
 Flowers won't collide with vehicles no more.
 Increase HP of paper-thin palisades.
 Many animals such as coyotes and dogs are now less aggressive across the board.
+Allow fishing in fishable non-river locations.
+Nerf pneumatic gun reload times.
+Modifies calorie amounts for flesh/fish and Fat products, including butchery products.
+Rework vehicle safe and max velocities based on physics.
+Adding more requirements to screwdriver set recipe.
+Causes corpse damage level to negatively affect butchery yields.
 
 ## Bugfixes:
 
@@ -856,6 +912,23 @@ Fix item category names not updated when switching the language.
 Fixed lightmap-related crashes in MinGW 64-bit executables.
 npc: NPCs on guard duty in a vehicle stay in the vehicle.
 Fixes isometric tile rendering.
+Npc: friendly NPCs only warn about hostile monsters.
+Fix bomb fragment placement with z-levels on.
+Fixes safemode custom rules when creating a new character.
+Melee: make sure aoe techniques don't access an array out of bounds.
+Fix aiming if target moves out of LOS.
+Improve terrain bashing with experimental z-levels.
+Allow turrets to shoot "over" the vehicle they are mounted on.
+Vehicles: show active, fueled engines or battery in sidebar fuel indicator.
+Hack around android joystick shifting bug.
+Restore NPC ability to target player.
+Deep bites now actually progress over time.
+Fixes errors in graphical builds without sound enabled.
+assure_dir_exist now creates parent directories recursively.
+Skip dodge and block techniques when looking for a normal technique.
+Fixed zombie necromancer was able to revive zombies pulped by a very hard hit.
+Fix aiming anywhere after player has moved.
+Applies radiation mitigation to all sources.
 
 ## Performance:
 
@@ -898,6 +971,10 @@ Reduce Submap constant memory requirements of Cosmetic strings.
 Reduce memory consumption for soundpacks.
 Fix lag due to copying player objects.
 Encode mapbuffer terrain data using RLE scheme for smaller save files.
+Faster item layer computation.
+Improve performance of encumbrance calculations.
+Lazily load sound effects as they are encountered instead of at application startup unless explicitly preloaded.
+Faster color name lookup.
 
 ## Infrastructure:
 
@@ -1025,31 +1102,43 @@ Npctalk to JSON: Move most NPC dialog to JSON.
 Properly implement time duration string alignment.
 made_of_any(materials) for creature.
 Add the option to create Changelogs grouped by Build to generate_changelog.py
-POSIX crash handling and backtrace improvements.
 Add support for deferral of player movement, use it to fix two bugs.
 Load time duration from string (containing units).
 Converts monster size to weight and volume.
 Replace usage of sentinel tripoint_min with cata::optional.
 Add more functions to vpart_position and vpart_reference
-Move most NPC dialogue into JSON
-Better clarity in item description code
-clean up handling of vehicle power to always use watts
-Add error reporting to many calls of SDL function
-Final cleanup of uimenu -> uilist migration
-Changes various functions in `vehicle` to take arguments as a single `point` instead of x,y values.
-Replace usage of raw managed pointers with values / managed pointers
-Do not ask for retarget when opening projects in Visual Studio
-Print the Cataclysm version number in the debug log
-Fix foldstring ignoring multiple linebreaks
-Make point and tripoint literal so they can be used in constexpr contexts.
-Move most NPC dialogue into JSON.
+Better clarity in item description code.
 Clean up handling of vehicle power to always use watts.
-Replace usage of raw managed pointers with values / managed pointers.
+Add error reporting to many calls of SDL function.
 Do not ask for retarget when opening projects in Visual Studio.
 Print the Cataclysm version number in the debug log.
+Fix foldstring ignoring multiple linebreaks
+Make point and tripoint literal so they can be used in constexpr contexts.
 POSIX backtraces now work for installed binaries and position-independent executables.
 Improved CI infrastructure error handling.
 Allow explicit specification of overmap special connection type.
+Find or create overmap special after overmap generation.
+Basecamp, faction camp: start merging faction camps into basecamps.
+Better statistics in tests.
+Upgrade tests to Catch2 2.5.0.
+Show debug logs during tests.
+Missions: autoset monster_kill_goal for KILL_TYPE and KILL_SPEC.
+Missions: Move some start functions into JSON.
+Add tracking of overmap special for placed terrain.
+Faction camps: consolidate and clean up farm code.
+Basecamp: try to regularize mission starts and mission returns.
+Unhardcoded comfort, warmth and feet fire bonus values for furniture.
+Reorganize NPC backstories into their own folder.
+Enable JSONized placement of overmap specials at mission start.
+Split sound functionality out of sdltiles.cpp into its own file.
+Split comestibles.json into many files.
+NPC expertise infrastructure.
+Changed butchery to use JSON for drops, for all butchery actions.
+Show test times in CI results.
+Add tool qualities to the game for later use in scientific tools.
+Replace tag_colored_string with colorize.
+Run tests for CMake CI build.
+Simpler test randomness seeding.
 
 ## Build:
 
@@ -1124,6 +1213,11 @@ Vehicle power test: make it more consistent.
 Visual Studio solution with vcpkg support.
 Use travis build stages.
 Run tests under AddressSanitizer in Travis CI.
+Sort generated lua bindings source file to allow reproducible builds.
+Adding astyle to deb/ubuntu packages.
+Automate changelog generation.
+Add macOS to travis-ci builds.
+Added VS solution to build statically linked executable using vcpkg.
 
 ## I18N and A11Y:
 
@@ -1157,6 +1251,8 @@ Display l10nized tab names when creating new world.
 Link against ncursesw if L10N enabled.
 Make user-facing error messages translatable.
 Many, Many new strings and menus are translatable.
+Provide context for translating strings of monster abilities.
+Allowed recoil level to be translated.
 
 ## Statistics:
 

data/fontdata.json

@@ -1,15 +1,15 @@
 {
-    "fontblending": false,
-    "fontwidth": 8,
-    "fontheight": 16,
-    "fontsize": 16,
-    "typeface": "unifont",
-    "map_fontwidth": 8,
-    "map_fontheight": 16,
-    "map_fontsize": 16,
-    "map_typeface": "unifont",
-    "overmap_fontwidth": 8,
-    "overmap_fontheight": 16,
-    "overmap_fontsize": 16,
-    "overmap_typeface": "unifont"
+  "fontblending": false,
+  "fontwidth": 8,
+  "fontheight": 16,
+  "fontsize": 16,
+  "typeface": "unifont",
+  "map_fontwidth": 8,
+  "map_fontheight": 16,
+  "map_fontsize": 16,
+  "map_typeface": "unifont",
+  "overmap_fontwidth": 8,
+  "overmap_fontheight": 16,
+  "overmap_fontsize": 16,
+  "overmap_typeface": "unifont"
 }