Merge pull request #1 from CleverRaven/master

CannedBread

.appveyor.yml

@@ -19,11 +19,7 @@ cache:
   - 'c:\tools\vcpkg\installed'
 install:
     # 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
+    - cmd: vcpkg --triplet %PLATFORM%-windows-static install sdl2 sdl2-image sdl2-mixer sdl2-ttf gettext
 build:
   parallel: true
   project: /msvc-full-features/Cataclysm-vcpkg-static.sln

.clang-tidy

@@ -0,0 +1,6 @@
+Checks: 'clang-diagnostic-*,modernize-use-using'
+WarningsAsErrors: '*'
+HeaderFilterRegex: '(src|test).*'
+FormatStyle:     none
+
+# vim:tw=0

.gitattributes

@@ -9,7 +9,6 @@
 *.cpp     text
 *.h       text
 *.json    text
-*.lua     text
 *.md      text
 *.py      text
 *.rc      text

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,29 +3,56 @@ name: Bug report
 about: Create a report to help us improve
 
 ---
+<!-- Please follow the template below -->
+
+# Describe the bug
 
-**Describe the bug**  
 A clear and concise description of what the bug is.
 
-**To Reproduce**  
+
+# Steps To Reproduce
+
 Steps to reproduce the behavior:
 1. Make a player with a gun, magazine, and some ammo.
 2. Try to aim at a wall.
 3. There's no way to increase aim level.
 
-**Expected behavior**  
-A clear and concise description of what you expected to happen.  
+
+# Expected behavior
+
+A clear and concise description of what you expected to happen.
 Ideally also describe *why* you expect it to happen.
 
-**Screenshots**  
-If applicable, add screenshots to help explain your problem.
 
-**Versions and configuration(please complete the following information):**
+# Screenshots
+
+**If applicable**, add screenshots to help explain your problem.
+
+<!-- Do not take a screenshot of the crashing window. Please provide the crash logs in the "Additional context" -->
+
+# Versions and configuration
+
+<!-- Please complete the following information; you can now go to:
+    - "Main menu (ESC) > Debug Menu > Info > Generate game report" to generate this report.
+    - Please update your OS version with a more precise version. -->
+
  - OS: [e.g. iOS 8 or Windows 10 or Ubuntu 18.04]
  - Game Version: [from the main menu, e.g. 0.C-29938-g90f5268437]
  - Graphics version: [Tiles or Terminal]
  - Mods loaded: [e.g.dda, boats, hacktheplanet, StatsThroughSkills]
 
-**Additional context**  
-Add any other context about the problem here.  
-E.g. A link to a savegame that allows the issue to be reproduced.
+
+# Additional context
+
+Add any other context about the problem here.
+
+<!-- Crash: if your problem refers to a crash, please add the following files to the "Additional Context" paragraph:
+    - From the /config folder (you can zip them both together):
+        - crash.log file.
+        - debug.log file.
+    - Your save file (zipped)
+
+- note #1: you can drag and drop files in this issue post!
+- note #2: it is very important for us that you provide a save file in case of a crash. It really helps the developers
+    to reproduce the bug and fix it. If possible, try to provide a save file that occurs in the right conditions, just
+    before the crash happens. -->

.github/pull_request_template.md

@@ -1,29 +1,45 @@
 <!--
 ### How to use
-Leave the headings unless they don't apply to your PR, replace commented out text ( surrounded with <!-- and -​-> ) with text describing your PR.
+Leave the headings unless they don't apply to your PR, replace commented out text (surrounded with <!–– and ––>) with text describing your PR.
 -->
 
 #### Summary
 <!--
-A one-line description of your change that will be extracted and added to the project changelog at https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt
-The format is: ```SUMMARY: Category "description"```  
-The categories to choose from are: Features, Content, Interface, Mods, Balance, Bugfixes, Performance, Infrastructure, Build, I18N  
+A one-line description of your change that will be extracted and added to the [project changelog](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt).
+
+The format is (ignore the square brackets): ```SUMMARY: [Category] "[description]"```
+
+The categories to choose from are:
+
+* Features
+* Content
+* Interface
+* Mods
+* Balance
+* Bugfixes
+* Performance
+* Infrastructure
+* Build
+* I18N
+
 Example: ```SUMMARY: Content "Adds new mutation category 'Mouse'"```
-See the Changelog Guidelines at https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md for explanations of the categories.
+
+See the [Changelog Guidelines](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md) for explanations of the categories.
 -->
 
 #### Purpose of change
 <!--
-If there's an existing issue describing the problem this PR addresses or the feature it adds, please link it like: ```#1234```  
-If it *fully* resolves an issue, link it like: ```Fixes #1234```  
-Even if the issue describes the problem, please provide a few-sentence summary here.  
-Example: ```Fixes #1234 - XL mutants cannot wear arm/leg splints due to missing OVERSIZE flag.```  
+If there's an existing issue describing the problem this PR addresses or the feature it adds, please link it like: ```#1234```
+If it *fully* resolves an issue, link it like: ```Fixes #1234```
+Even if the issue describes the problem, please provide a few-sentence summary here.
+Example: ```Fixes #1234 - XL mutants cannot wear arm/leg splints due to missing OVERSIZE flag.```
 If there is no related issue, please describe the issue you are addressing, including how to trigger a bug if this is a bugfix.
+Don't put the backticks around the `#` and issue or pull request number to allow the GitHub automatically reference to it.
 -->
 
 #### Describe the solution
 <!--
-How does the feature work, or how does this fix a bug?  
+How does the feature work, or how does this fix a bug?
 The easier you make your solution to understand, the faster it can get merged.
 -->
 
@@ -34,5 +50,5 @@ A clear and concise description of any alternative solutions or features you've
 
 #### Additional context
 <!--
-Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature or bugfix here. 
+Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature or bugfix here.
 -->

.gitignore

@@ -10,6 +10,7 @@
 /WinDepend/
 /bindist/
 /build/
+/build-start-time
 /cmake-build-debug/
 /config/
 /data/*.template
@@ -24,7 +25,6 @@
 /obj/
 /objwin/
 /save/
-/src/lua/catabindings.cpp
 /src/version.h
 /sound/
 /templates/
@@ -47,6 +47,7 @@ logg.txt
 *.ilk
 *.opensdf
 *.pdb
+*.lib
 *.sdf
 *.suo
 *.user
@@ -170,3 +171,8 @@ Xcode/
 
 # gdb
 .gdb_history
+
+# Flatpak build artifacts
+/.flatpak-builder/
+/repo/
+/build-dir/