Merge branch 'ai_cleanup' into dev

Conflicts:
	.gitmodules
	src/xrEngine/EngineAPI.cpp
	src/xrEngine/x_ray.cpp
	src/xrGame/xrGame.vcxproj
	src/xrPhysics/ExtendedGeom.h
	src/xrPhysics/MathUtils.cpp
	src/xrPhysics/MathUtilsOde.h
	src/xrPhysics/PHActivationShape.cpp
	src/xrPhysics/PHBaseBodyEffector.h
	src/xrPhysics/PHCapture.h
	src/xrPhysics/PHCharacter.cpp
	src/xrPhysics/PHContactBodyEffector.h
	src/xrPhysics/PHDisabling.h
	src/xrPhysics/PHElement.cpp
	src/xrPhysics/PHFracture.cpp
	src/xrPhysics/PHFracture.h
	src/xrPhysics/PHInterpolation.h
	src/xrPhysics/PHIsland.h
	src/xrPhysics/PHJoint.h
	src/xrPhysics/PHJointDestroyInfo.h
	src/xrPhysics/PHMoveStorage.cpp
	src/xrPhysics/Physics.cpp
	src/xrPhysics/SpaceUtils.h
	src/xrPhysics/dRayMotions.cpp
	src/xrPhysics/dcylinder/dCylinder.h
	src/xrPhysics/ode_include.h
	src/xrPhysics/ph_valid_ode.h
	src/xrPhysics/tri-colliderknoopc/dTriColliderCommon.h
	src/xrPhysics/tri-colliderknoopc/dTriColliderMath.h
	src/xrPhysics/tri-colliderknoopc/dTriList.h
	src/xrPhysics/tri-colliderknoopc/dxTriList.h
	src/xrPhysics/xrPhysics.cpp
	src/xrPhysics/xrPhysics.vcxproj

.gitignore

@@ -9,19 +9,3 @@ intermediate/
 intermediate_plugs/
 lib/
 *.aps
-
-# exclude all third-party libraries
-src/Externals/3dsmax
-src/Externals/BugTrap
-src/Externals/FreeImage
-src/Externals/jpeg
-src/Externals/libogg-1.1.4
-src/Externals/libtheora-1.1.1
-src/Externals/libvorbis-1.2.3
-src/Externals/lightwave
-src/Externals/MagicSoftware
-src/Externals/maya
-src/Externals/nvapi
-src/Externals/OpenAutomate
-src/Externals/OpenSSL
-src/Externals/zlib

.gitmodules

@@ -1,6 +1,12 @@
+[submodule "src/Externals/luabind"]
+	path = src/Externals/luabind
+	url = [email protected]:OpenXRay/luabind-deboostified.git
+[submodule "src/Externals/luajit"]
+	path = src/Externals/luajit
+	url = [email protected]:OpenXRay/LuaJIT.git
 [submodule "src/Externals/glbinding"]
 	path = src/Externals/glbinding
-	url = https://github.com/cginternals/glbinding.git
+	url = git@github.com:cginternals/glbinding.git
 [submodule "src/Externals/gli"]
 	path = src/Externals/gli
-	url = https://github.com/g-truc/gli
+	url = git@github.com:g-truc/gli

doc/howto/build.txt

@@ -25,6 +25,7 @@ To build X-Ray Engine you'll need following libraries:
 * DirectX SDK June 2010: http://www.microsoft.com/en-us/download/details.aspx?id=6812
   - replace dxguid.lib with the one from Windows SDK
     (for DirectPlay GUIDs)
+XXX nitrocaster: add LuaJIT & LuaBind instructions
 
 You can download all these libraries (except Windows/DirectX SDK) with compiled binaries here:
 https://dl.dropboxusercontent.com/u/63973281/dev/xray/xray-16-libraries.zip
@@ -35,31 +36,33 @@ Setup:
 - Install patch 1.6.02 (only for russian locale, worldwide release should have it included):
   http://cop.stalker-game.ru/?page=patches#2
 - Download and unpack archive with libraries
-- Create _bin_dbg, _bin_mix and _bin_rel folders in the game installation directory
-- Copy following files from bin to _bin_dbg, _bin_mix and _bin_rel:
+- Create _bin_dbg_Win32, _bin_mix_Win32 and _bin_rel_Win32 folders in the game installation directory
+  (Debug, Mixed and Release binaries for 32-bit Windows). Hereinafter '_bin_xxx_Win32' is referred to as 'xbin'.
+- Copy following files from bin to xbin:
   - dbghelp.dll
   - eax.dll
   - wrap_oal.dll
-- Copy following files from bin to _bin_dbg\dedicated, _bin_mix\dedicated and _bin_rel\dedicated:
+- Copy following files from bin to xbin\dedicated:
   - eax.dll
   - wrap_oal.dll
-- For _bin_rel and _bin_mix:
-  - Copy BugTrap.dll from src\Externals\BugTrap\Bin
-- For _bin_dbg:
-  - Copy BugTrapD.dll from src\Externals\BugTrap\Bin and rename it to BugTrap.dll
-- Copy following files from src\Externals\OpenSSL\bin to _bin_dbg, _bin_mix and _bin_rel:
+- Copy following files from src\Externals\BugTrap\Bin to xbin:
+  - Debug configuration:
+    - BugTrapD.dll (rename to BugTrap.dll)
+  - Other configurations:
+    - BugTrap.dll
+- Copy following files from src\Externals\OpenSSL\bin to xbin:
   - libeay32.dll
   - ssleay32.dll
 - Create soft link to /gamedata in the game installation directory:
   $ mklink /D <game installation directory>\gamedata <xray-16 repository root>\res\gamedata  
 - After successful build use xrbinup.cmd to update game binaries:
-  $ xrbinup.cmd "E:\Program Files (x86)\GSC World Publishing\STALKER-COP" %src% dbg  
+  $ xrbinup.cmd "E:\Program Files (x86)\GSC World Publishing\STALKER-COP" %src% Win32 Debug  
 - You can create cmd script to update binaries in a single click, for example:
   @echo off
   setlocal
   set src="E:\git\xray-16"
   set dst="E:\Program Files (x86)\GSC World Publishing\STALKER-COP"
-  call xrbinup.cmd %dst% %src% dbg
+  call xrbinup.cmd %dst% %src% Win32 Debug
   endlocal
 
 XXX nitrocaster: add script for copying/renaming/soft linking