Merge pull request CleverRaven#22 from CleverRaven/master

Catchup
John-Candlebury · Jul 15, 2020 · d492872 · d492872
2 parents 3558e43 + 5837d3f
commit d492872
Show file tree

Hide file tree

Showing 1,021 changed files with 117,195 additions and 39,409 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,5 +1,5 @@
 version: '{branch}.{build}'
-image: Previous Visual Studio 2019
+image: Visual Studio 2019
 configuration: Release
 platform: x64
 shallow_clone: true

diff --git a/.clang-tidy b/.clang-tidy
@@ -35,8 +35,6 @@ readability-*,\
 -modernize-return-braced-init-list,\
 -modernize-use-default-member-init,\
 -modernize-use-emplace,\
--modernize-use-transparent-functors,\
--performance-for-range-copy,\
 -performance-inefficient-vector-operation,\
 -performance-noexcept-move-constructor,\
 -performance-implicit-conversion-in-loop,\

diff --git a/.gitignore b/.gitignore
@@ -69,6 +69,9 @@ Cataclysm.exe.lastcodeanalysissucceeded
 #Visual Studio 2017
 /msvc-full-features/PredictedInputCache_Debug_x64.dat
 
+#vcpkg
+/msvc-full-features/vcpkg_installed
+
 # PVS Studio
 /msvc-full-features/*PVS-Studio*
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ set(PREFIX           "" CACHE STRING "Location of Data & GFX directories")
 include(CTest)
 
 include(GetGitRevisionDescription)
-git_describe(GIT_VERSION)
+git_describe(GIT_VERSION --tags --always --match "[0-9A-Z]*.[0-9A-Z]*")
 
 MESSAGE("\n * Cataclysm: Dark Days Ahead is a turn-based survival game set in a post-apocalyptic world.")
 MESSAGE("   _________            __                   .__                                ")

diff --git a/build-scripts/build.sh b/build-scripts/build.sh
@@ -124,7 +124,6 @@ then
         else
             remaining_cpp_files="$all_cpp_files"
         fi
-        set -x
 
         function analyze_files_in_random_order
         {
@@ -142,6 +141,7 @@ then
 
         echo "Analyzing remaining files"
         analyze_files_in_random_order "$remaining_cpp_files"
+        set -x
     else
         # Regular build
         make -j$num_jobs

diff --git a/build-scripts/clang-tidy-wrapper.sh b/build-scripts/clang-tidy-wrapper.sh
@@ -5,7 +5,6 @@ set -o pipefail
 
 plugin=build/tools/clang-tidy-plugin/libCataAnalyzerPlugin.so
 
-set -x
 if [ -f "$plugin" ]
 then
     LD_PRELOAD=$plugin "$CATA_CLANG_TIDY" "$@"

diff --git a/data/core/basic.json b/data/core/basic.json
@@ -12,8 +12,8 @@
     "category": "food",
     "name": { "str_sp": "water" },
     "description": "Water, the stuff of life, the best thirst-quencher available.  It would be safer to drink once purified.",
-    "weight": 250,
-    "volume": 1,
+    "weight": "250 g",
+    "volume": "250 ml",
     "price": 50,
     "symbol": "~",
     "color": "light_blue",
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ set -o pipefail @@
     plugin=build/tools/clang-tidy-plugin/libCataAnalyzerPlugin.so
-    set -x
     if [ -f "$plugin" ]
     then
         LD_PRELOAD=$plugin "$CATA_CLANG_TIDY" "$@"
@@ Expand Down @@