Update .gitignore to latest sources

Author: qaisjp

.gitignore

@@ -1,5 +1,13 @@
-#### General system gitignore contents:
-#### Source: https://raw.githubusercontent.com/github/gitignore/master/Global/Linux.gitignore
+##################
+## Our own ignores
+##################
+output/
+
+
+#########################################################################
+## General system gitignore contents:
+## Source: github.com/github/gitignore/blob/master/Global/Linux.gitignore
+#########################################################################
 *~
 
 # KDE directory preferences
@@ -8,8 +16,12 @@
 # Linux trash folder which might appear on any partition or disk
 .Trash-*
 
-#### General system gitignore contents:
-#### Source: https://raw.githubusercontent.com/github/gitignore/master/Global/Windows.gitignore
+
+
+###########################################################################
+## General system gitignore contents:
+## Source: github.com/github/gitignore/blob/master/Global/Windows.gitignore
+###########################################################################
 # Windows image file caches
 Thumbs.db
 ehthumbs.db
@@ -29,8 +41,12 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-#### General system gitignore contents:
-#### Source: https://raw.githubusercontent.com/github/gitignore/master/Global/OSX.gitignore
+
+
+#######################################################################
+## General system gitignore contents:
+## Source: github.com/github/gitignore/blob/master/Global/OSX.gitignore
+#######################################################################
 .DS_Store
 .AppleDouble
 .LSOverride
@@ -57,8 +73,12 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-#### Visual Studio gitignore contents:
-#### Source: https://raw.githubusercontent.com/github/gitignore/master/VisualStudio.gitignore
+
+
+#########################################################################
+## Visual Studio gitignore contents:
+## Source: github.com/github/gitignore/blob/master/VisualStudio.gitignore
+#########################################################################
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
@@ -83,8 +103,10 @@ bld/
 [Bb]in/
 [Oo]bj/
 
-# Visual Studo 2015 cache/options directory
+# Visual Studio 2015 cache/options directory
 .vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -99,6 +121,10 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
+# DNX
+project.lock.json
+artifacts/
+
 *_i.c
 *_p.c
 *_i.h
@@ -131,6 +157,7 @@ _Chutzpah*
 ipch/
 *.aps
 *.ncb
+*.opendb
 *.opensdf
 *.sdf
 *.cachefile
@@ -139,6 +166,7 @@ ipch/
 *.psess
 *.vsp
 *.vspx
+*.sap
 
 # TFS 2012 Local Workspace
 $tf/
@@ -151,7 +179,7 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding addin-in
+# JustCode is a .NET coding add-in
 .JustCode
 
 # TeamCity is a build add-in
@@ -163,6 +191,7 @@ _TeamCity*
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
+nCrunchTemp_*
 
 # MightyMoose
 *.mm.*
@@ -208,11 +237,20 @@ publish/
 csx/
 *.build.csdef
 
+# Windows Azure Emulator
+ecf/
+rcf/
+
 # Windows Store app package directory
 AppPackages/
 
-# Others
+# Visual Studio cache files
+# files ending in .cache can be ignored
 *.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
 ClientBin/
 [Ss]tyle[Cc]op.*
 ~$*
@@ -222,7 +260,7 @@ ClientBin/
 *.pfx
 *.publishsettings
 node_modules/
-bower_components/
+orleans.codegen.cs
 
 # RIA/Silverlight projects
 Generated_Code/
@@ -247,6 +285,9 @@ UpgradeLog*.htm
 # Microsoft Fakes
 FakesAssemblies/
 
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
 
@@ -256,5 +297,16 @@ FakesAssemblies/
 # Visual Studio 6 workspace options file
 *.opt
 
-# Our own ignores
-output/
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+
+# FAKE - F# Make
+.fake/

MTA10/mods/shared_logic/luadefs/CLuaSearchLightDefs.cpp

@@ -2,7 +2,7 @@
 *
 *  PROJECT:     Multi Theft Auto v1.0
 *  LICENSE:     See LICENSE in the top level directory
-*  FILE:        mods/shared_logic/CLuaSearchLightDefs.cpp
+*  FILE:        mods/shared_logic/luadefs/CLuaSearchLightDefs.cpp
 *  PURPOSE:     Lua searchlight class functions
 *
 *  Multi Theft Auto is available from http://www.multitheftauto.com/

MTA10/mods/shared_logic/luadefs/CLuaSearchLightDefs.h

@@ -2,15 +2,15 @@
 *
 *  PROJECT:     Multi Theft Auto v1.0
 *  LICENSE:     See LICENSE in the top level directory
-*  FILE:        mods/shared_logic/CLuaSearchLightDefs.h
+*  FILE:        mods/shared_logic/luadefs/CLuaSearchLightDefs.h
 *  PURPOSE:     Lua searchlight class functions
 *
 *  Multi Theft Auto is available from http://www.multitheftauto.com/
 *
 *****************************************************************************/
 
 #pragma once
-//#include "CLuaDefs.h"
+#include "CLuaDefs.h"
 
 class CLuaSearchLightDefs : public CLuaDefs
 {
@@ -19,4 +19,4 @@ class CLuaSearchLightDefs : public CLuaDefs
     static void     AddClass ( lua_State* luaVM );
 
     LUA_DECLARE ( CreateSearchLight );
-};
+};