Merge pull request #15 from CleverRaven/master

Bring me up to date

.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

.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

@@ -22,9 +22,9 @@ If applicable, add screenshots to help explain your problem.
 
 **Versions and configuration(please complete the following information):**
  - 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]
+ - 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.  

.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

@@ -24,7 +24,6 @@
 /obj/
 /objwin/
 /save/
-/src/lua/catabindings.cpp
 /src/version.h
 /sound/
 /templates/

.travis.yml

@@ -30,6 +30,7 @@ os: linux
 branches:
   only:
   - master
+  - development
 
 jobs:
   include:
@@ -62,8 +63,8 @@ jobs:
         apt:
           packages: ["wine"]
 
-    # CMake Clang 6.0 Tiles
-    - env: CLANG=clang++-6.0 TILES=1 SOUND=1 CXXFLAGS=-Wno-error=unused-command-line-argument CMAKE=1
+    # CMake Clang 6.0 Tiles with CMAKE
+    - env: CLANG=clang++-6.0 TILES=1 SOUND=1 CXXFLAGS=-Wno-error=unused-command-line-argument CMAKE=1 RELEASE=1
       dist: trusty
       compiler: clang
       addons: &clang60
@@ -72,7 +73,7 @@ jobs:
           sources: [*apt_sources, llvm-toolchain-trusty-6.0]
 
     # macOS Tiles
-    - env: CLANG=clang++ NATIVE=osx OSX_MIN=10.13 TILES=1 SOUND=1 LUA=1
+    - env: CLANG=clang++ NATIVE=osx OSX_MIN=10.13 TILES=1 SOUND=1
       os: osx
       osx_image: xcode10.1
       compiler: clang

CMakeLists.txt

@@ -9,7 +9,6 @@ SET(CMAKE_MODULE_PATH
 )
 
 # Build options
-option(LUA          "Lua support (required for some mods)."					"OFF")
 option(TILES        "Build graphical tileset version."						"OFF")
 option(CURSES       "Build curses version."							"ON" )
 option(SOUND        "Support for in-game sounds & music."					"OFF")
@@ -18,9 +17,8 @@ option(USE_HOME_DIR "Use user's home directory for save files."					"ON" )
 option(LOCALIZE     "Support for language localizations. Also enable UTF support."		"ON" )
 option(LANGUAGES    "Compile localization files for specified languages."			""   )
 option(DYNAMIC_LINKING "Use dynamic linking. Or use static to remove MinGW dependency instead."	"ON")
-option(LUA_BINARY   "Lua binary name or path. You can try to use luajit for extra speed."	"")
 option(GIT_BINARY   "Git binary name or path."							"")
-OPTION(PREFIX       "Location of Data,GFX, & Lua directories"                                   "")
+OPTION(PREFIX       "Location of Data & GFX directories"                                   "")
 
 include(CTest)
 
@@ -99,16 +97,6 @@ ELSE (NOT DYNAMIC_LINKING)
 	ENDIF(MINGW AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 ENDIF (NOT DYNAMIC_LINKING)
 
-IF(${CMAKE_SYSTEM_NAME} MATCHES Windows)
-	SET(_OS_WINDOWS_ 1)
-	GET_FILENAME_COMPONENT(MINGW_BIN_DIRECTORY ${CMAKE_CXX_COMPILER} PATH)
-	SET(RC_COMPILER_FILENAME "windres.exe")
-	FIND_FILE(RC_COMPILER_PATH ${RC_COMPILER_FILENAME})
-	IF(RC_COMPILER_PATH)
-		MESSAGE(STATUS "Found .rc compiler: ${RC_COMPILER_PATH}")
-	ENDIF(RC_COMPILER_PATH)
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES Windows)
-
 #Sysem specific actions
 IF (${CMAKE_SYSTEM_NAME} MATCHES Linux OR ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
     IF(NOT DATA_PREFIX)
@@ -150,10 +138,6 @@ ENDIF (${CMAKE_SYSTEM_NAME} MATCHES Windows)
 MESSAGE(STATUS "${PROJECT_NAME} build options --\n")
 
 # Preset variables
-IF (NOT LUA_BINARY)
-	SET (LUA_BINARY "lua")
-ENDIF (NOT LUA_BINARY)
-
 IF(NOT LANGUAGES)
 	SET (LANGUAGES de es_AR es_ES fr it_IT ja ko pt_BR ru zh_CN zh_TW)
 ENDIF(NOT LANGUAGES)
@@ -202,16 +186,12 @@ ELSE (CMAKE_BUILD_TYPE STREQUAL Debug)
 	MESSAGE(STATUS "PIXMAPS_UNITY_ENTRY_PATH      : ${PIXMAPS_UNITY_ENTRY_PATH}")
 	MESSAGE(STATUS "MANPAGE_ENTRY_PATH            : ${MANPAGE_ENTRY_PATH}\n")
 	ADD_DEFINITIONS(-DRELEASE)
-    # Use PREFIX as storage of data,gfx,lua etc.. Usefull only on *nix OS.
+    # Use PREFIX as storage of data,gfx, etc.. Usefull only on *nix OS.
     IF (PREFIX AND NOT WIN32)
 	    ADD_DEFINITIONS(-DDATA_DIR_PREFIX)
     ENDIF (PREFIX AND NOT WIN32)
 ENDIF (CMAKE_BUILD_TYPE STREQUAL Debug)
 
-	MESSAGE(STATUS "LUA                           : ${LUA}")
-IF (LUA)
-	MESSAGE(STATUS "LUA_BINARY                    : ${LUA_BINARY}")
-ENDIF (LUA)
 	MESSAGE(STATUS "GIT_BINARY                    : ${GIT_EXECUTABLE}")
 	MESSAGE(STATUS "DYNAMIC_LINKING               : ${DYNAMIC_LINKING}")
 	MESSAGE(STATUS "TILES                         : ${TILES}")
@@ -319,16 +299,6 @@ IF(SOUND)
 	ENDIF(NOT SDL2_MIXER_FOUND)
 ENDIF(SOUND)
 
-IF(LUA)
-	FIND_PACKAGE(Lua)
-	IF(NOT LUA_FOUND)
-	MESSAGE(FATAL_ERROR
-		"You need the Lua development library to be able to compile with Lua support.\nSee INSTALL file for details and more info\n"
-	)
-	ENDIF(NOT LUA_FOUND)
-	ADD_DEFINITIONS(-DLUA)
-ENDIF(LUA)
-
 IF(BACKTRACE)
 	ADD_DEFINITIONS(-DBACKTRACE)
 ENDIF(BACKTRACE)
@@ -357,11 +327,6 @@ IF(USE_HOME_DIR)
 	ADD_DEFINITIONS(-DUSE_HOME_DIR)
 ENDIF(USE_HOME_DIR)
 
-IF(LUA)
-	add_subdirectory(lua)
-	add_subdirectory(src/lua)
-ENDIF(LUA)
-
 add_subdirectory(src)
 add_subdirectory(data)
 if (NOT MSVC)