Merge branch 'master' into DinoDNA

.appveyor.yml

@@ -2,58 +2,29 @@ version: '{branch}.{build}'
 os: Windows
 clone_folder: C:\Projects\Cataclysm-DDA
 shallow_clone: true
-matrix:
-    fast_finish: false 
 pull_requests:
     do_not_increment_build_number: false
-image:
-    # - Visual Studio 2017
-    - Visual Studio 2015
-configuration:
-    - Release
-    # - Debug
-platform:
-    - x64
-    # - x86
 environment:
     matrix:
-        - TOOLCHAIN: msvc14
+        - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+          PROJECT: /msvc-full-features/Cataclysm-vcpkg-static.sln
+          COMPILER: msvc2017
+          TOOLCHAIN: msvc15
+          PLATFORM: x64
+          CONFIGURATION: Release
+          APPVEYOR_SAVE_CACHE_ON_ERROR: true
+matrix:
+    fast_finish: false
+cache:
+  - 'c:\tools\vcpkg\installed'
 install:
-    # Set TEMP folder
-    - cmd: set TEMP_FOLDER=C:\Temp
-    - cmd: mkdir "%TEMP_FOLDER%"
-
-    # Create WINDEPEND folder
-    - cmd: mkdir "%APPVEYOR_BUILD_FOLDER%\WinDepend"
-
-    # Add WINDEPEND folder to PATH (for LUA binary)
-    - cmd: set PATH=%APPVEYOR_BUILD_FOLDER%\WinDepend;%PATH%
-
-    # Download WINDEPEND archive
-    - ps : |
-        [Net.ServicePointManager]::SecurityProtocol = 'Ssl3, Tls, Tls11, Tls12'
-        Start-FileDownload "http://dev.narc.ro/cataclysm/WinDepend-MSVC.7z" -FileName "$($env:TEMP_FOLDER)\WinDepend-MSVC.7z"
-
-    # Unpack WINDEPEND archive to WINDEPEND folder
-    - cmd: 7z x -y "%TEMP_FOLDER%\WinDepend-MSVC.7z" -o"%APPVEYOR_BUILD_FOLDER%"
-
-    # Download LUA archive
-    - ps : |
-        [Net.ServicePointManager]::SecurityProtocol = 'Ssl3, Tls, Tls11, Tls12'
-        Start-FileDownload "https://www.dropbox.com/s/49vexob83bi5nrf/lua.zip?dl=1" -FileName "$($env:TEMP_FOLDER)\lua.zip"
-
-    # Unpack LUA archive to WINDEPEND folder
-    - cmd: 7z x -y "%TEMP_FOLDER%\lua.zip" -o"%APPVEYOR_BUILD_FOLDER%\WinDepend"
-
+    # Install dependency packages
+    - cmd: vcpkg --triplet %PLATFORM%-windows-static install sdl2 sdl2-image sdl2-mixer sdl2-ttf gettext lua
+    # Add LUA binary folder to PATH
+    - cmd: set PATH=c:\tools\vcpkg\installed\%PLATFORM%-windows-static\tools\lua;%PATH%
     # Report LUA binary version
     - cmd: lua.exe -v
-
-    # Report debug info
-    #- cmd: echo %APPVEYOR_BUILD_FOLDER%
-    #- cmd: path
-    #- cmd: dir "%APPVEYOR_BUILD_FOLDER%\src\lua"
-
 build:
-  project: /msvc-full-features/Cataclysm.sln
   parallel: true
+  project: /msvc-full-features/Cataclysm-vcpkg-static.sln
   verbosity: minimal

.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.
@@ -222,6 +226,25 @@ You can also set the tracking information at the same time as creating the branc
         To https://github.com/YOUR_USERNAME/Cataclysm-DDA.git
         xxxx..xxxx  new_feature -> new_feature
 
+## Unit tests
+
+There is a suite of tests built into the source tree at tests/  
+You should run the test suite after ANY change to the game source.  
+An ordinary invocation of ``make`` will build the test executable at tests/cata_test, and it can be invoked like any ordinary executable.  
+With no arguments it will run the entire test suite.  
+With ``--help`` it will print a number of invocation options you can use to adjust its operation.
+
+    $ make
+    ... compilation details ...
+    $ tests/cata_test
+    Starting the actual test at Fri Nov  9 04:37:03 2018
+    ===============================================================================
+    All tests passed (1324684 assertions in 94 test cases)
+    Ended test at Fri Nov  9 04:37:45 2018
+    The test took 41.772 seconds
+
+I recommend habitually invoking make like ``make YOUR BUILD OPTIONS && tests/cata_test``.
+
 ## In-game testing, test environment and the debug menu
 
 Whether you are implementing a new feature or whether you are fixing a bug, it is always a good practice to test your changes in-game. It can be a hard task to create the exact conditions by playing a normal game to be able to test your changes, which is why there is a debug menu. There is no default key to bring up the menu so you will need to assign one first.

.gitignore

@@ -1,78 +1,97 @@
+!src/chkjson
+*.7z
+*.a
+*.d
+*.dll
+*.exe
+*.o
+*.tmp
+*.zip
+/WinDepend/
+/bindist/
+/build/
+/cmake-build-debug/
+/config/
+/data/*.template
+/data/font/
+/data/mods/user-default-mods.json
+/dep/
+/doxygen_doc/html/*
+/doxygen_doc/latex/*
+/graveyard/
+/memorial/
+/mods/
+/obj/
+/objwin/
+/save/
+/src/lua/catabindings.cpp
+/src/version.h
+/sound/
+/templates/
+/tools/format/json_formatter.cgi
+CataclysmWin.cscope_file_list
+CataclysmWin.depend
+CataclysmWin.layout
+cata_test
+cata_test-tiles
 cataclysm
 cataclysm-tiles
+cataclysm-vcpkg
+cataclysmdda-*
 chkjson*
-!src/chkjson
-data/*.template
-templates/
-save/
-mods/
-graveyard/
-memorial/
-obj/
 debug.log
 logg.txt
-bindist/
-cataclysmdda-*
-objwin/
-src/version.h
-src/lua/catabindings.cpp
-tools/format/json_formatter.cgi
-CataclysmWin.cscope_file_list
-CataclysmWin.depend
-CataclysmWin.layout
-*.exe
-*.dll
-WinDepend/
-*.7z
-*.zip
-build/
-dep/
-*.o
-*.d
-*.a
-cmake-build-debug/
-
-data/font/
-config/
-
-doxygen_doc/html/*
-doxygen_doc/latex/*
-
-data/mods/user-default-mods.json
 
 # Visual Studio files
-*.suo
-*.sdf
-*.pdb
+*.code-workspace
 *.ilk
-Release*/
-Debug*/
 *.opensdf
+*.pdb
+*.sdf
+*.suo
 *.user
 *.vcxproj.filters
+.vs/
 .vscode/
+Debug*/
+Release*/
+
+# Distribution script results
+/msvc-full-features/distribution
+
+# Visual Studio 2015
+/msvc-full-features/*db
+/msvc-full-features/ipch
+lnk*.tmp
+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
 *.sw?
+*~
+\#*
 gmon.out
 
 # System Files
-Thumbs.db
 .DS_Store
 ._.DS_Store
-tags
+Thumbs.db
 cscope.*
+tags
 
 # Compiled binary translations
-lang/mo/
+/lang/mo/
 
 # Directory for translatable strings
-lang/json/*
-!lang/json/README
+/lang/json/*
+!/lang/json/README
 
 # Netbeans IDE folders
 nbproject/
@@ -83,6 +102,7 @@ nbproject/
 # vim files
 *.vim
 *.session
+.ycm_extra_conf.py
 
 # taskwarrior files
 *.task*
@@ -102,11 +122,11 @@ Cataclysm.dmg
 .idea/
 
 # test executables and generated data
-tests/cata_test
-tests/line_test
-tests/map_iterator_test
-tests/shadowcasting_test
-tests/data/jsionized_overmap.sav
+/tests/cata_test
+/tests/line_test
+/tests/map_iterator_test
+/tests/shadowcasting_test
+/tests/data/jsionized_overmap.sav
 
 # static library used to link the test executable
 cataclysm.a
@@ -117,28 +137,19 @@ cataclysm.a
 # sublime-text workspace
 *.sublime-workspace
 
-# Visual Studio 2015
-msvc-full-features/*db
-msvc-full-features/ipch
-lnk*.tmp
-Cataclysm.exe.lastcodeanalysissucceeded
-
-#Visual Studio 2017
-msvc-full-features/PredictedInputCache_Debug_x64.dat
-
 # cppcheck
 *cppcheck.xml
 *.cppcheck
 
+# clang tooling
+compile_commands.json
+
 # IDA database
 Cataclysm.i64
 Cataclysm.id*
 Cataclysm.til
 Cataclysm.nam
 
-# Distribution script results
-msvc-full-features/distribution
-
 # Transifex Client
 .tx/