Merge branch 'dev' into ai_cleanup

Conflicts:
	src/Externals/luabind/library_linkage.cpp
	src/Externals/luabind/luabind.beta7-devel.rc4.vcxproj
	src/Externals/luabind/luabind.beta7-devel.rc4.vcxproj.filters
	src/Externals/luabind/luabind/INSTALL
	src/Externals/luabind/luabind/Jamfile
	src/Externals/luabind/luabind/LICENSE
	src/Externals/luabind/luabind/config
	src/Externals/luabind/luabind/doc/CVS/Entries
	src/Externals/luabind/luabind/doc/CVS/Repository
	src/Externals/luabind/luabind/doc/CVS/Root
	src/Externals/luabind/luabind/doc/CVS/Tag
	src/Externals/luabind/luabind/doc/adopt.rst
	src/Externals/luabind/luabind/doc/copy.rst
	src/Externals/luabind/luabind/doc/dependency.rst
	src/Externals/luabind/luabind/doc/discard_result.rst
	src/Externals/luabind/luabind/doc/docs.html
	src/Externals/luabind/luabind/doc/docs.rst
	src/Externals/luabind/luabind/doc/index.html
	src/Externals/luabind/luabind/doc/luabind-logo-label.ps
	src/Externals/luabind/luabind/doc/luabind.png
	src/Externals/luabind/luabind/doc/out_value.rst
	src/Externals/luabind/luabind/doc/pure_out_value.rst
	src/Externals/luabind/luabind/doc/raw.rst
	src/Externals/luabind/luabind/doc/return_reference_to.rst
	src/Externals/luabind/luabind/doc/return_stl_iterator.rst
	src/Externals/luabind/luabind/doc/style.css
	src/Externals/luabind/luabind/doc/yield.rst
	src/Externals/luabind/luabind/examples/any_converter/Jamfile
	src/Externals/luabind/luabind/examples/any_converter/any_converter.cpp
	src/Externals/luabind/luabind/examples/any_converter/makefile
	src/Externals/luabind/luabind/examples/cln/README
	src/Externals/luabind/luabind/examples/cln/cln_test.cpp
	src/Externals/luabind/luabind/examples/cln/cln_test.lua
	src/Externals/luabind/luabind/examples/cln/makefile
	src/Externals/luabind/luabind/examples/filesystem/Jamfile
	src/Externals/luabind/luabind/examples/filesystem/directory_iterator.hpp
	src/Externals/luabind/luabind/examples/filesystem/filesystem.cpp
	src/Externals/luabind/luabind/examples/filesystem/inspect.lua
	src/Externals/luabind/luabind/examples/filesystem/makefile
	src/Externals/luabind/luabind/examples/glut/glut_bind.cpp
	src/Externals/luabind/luabind/examples/glut/glut_bindings.lua
	src/Externals/luabind/luabind/examples/glut/makefile
	src/Externals/luabind/luabind/examples/intrusive_ptr/Jamfile
	src/Externals/luabind/luabind/examples/intrusive_ptr/intrusive_ptr.cpp
	src/Externals/luabind/luabind/examples/intrusive_ptr/makefile
	src/Externals/luabind/luabind/examples/makefile
	src/Externals/luabind/luabind/examples/regexp/Jamfile
	src/Externals/luabind/luabind/examples/regexp/makefile
	src/Externals/luabind/luabind/examples/regexp/regex.lua
	src/Externals/luabind/luabind/examples/regexp/regex_wrap.cpp
	src/Externals/luabind/luabind/makefile
	src/Externals/luabind/luabind/src/Jamfile
	src/Externals/luabind/luabind/src/class.cpp
	src/Externals/luabind/luabind/src/class_info.cpp
	src/Externals/luabind/luabind/src/class_registry.cpp
	src/Externals/luabind/luabind/src/class_rep.cpp
	src/Externals/luabind/luabind/src/create_class.cpp
	src/Externals/luabind/luabind/src/error.cpp
	src/Externals/luabind/luabind/src/find_best_match.cpp
	src/Externals/luabind/luabind/src/function.cpp
	src/Externals/luabind/luabind/src/implicit_cast.cpp
	src/Externals/luabind/luabind/src/link_compatibility.cpp
	src/Externals/luabind/luabind/src/makefile
	src/Externals/luabind/luabind/src/object.cpp
	src/Externals/luabind/luabind/src/object_rep.cpp
	src/Externals/luabind/luabind/src/open.cpp
	src/Externals/luabind/luabind/src/pcall.cpp
	src/Externals/luabind/luabind/src/ref.cpp
	src/Externals/luabind/luabind/src/scope.cpp
	src/Externals/luabind/luabind/src/stack_content_by_name.cpp
	src/Externals/luabind/luabind/src/weak_ref.cpp
	src/Externals/luabind/luabind/src/wrapper_base.cpp
	src/Externals/luabind/luabind_memory.cpp
	src/Externals/luabind/pch.cpp
	src/Externals/luabind/pch.h
	src/Externals/luajit/COPYRIGHT
	src/Externals/luajit/Makefile
	src/Externals/luajit/README
	src/Externals/luajit/doc/amazon.gif
	src/Externals/luajit/doc/contents.html
	src/Externals/luajit/doc/cover.png
	src/Externals/luajit/doc/logo.gif
	src/Externals/luajit/doc/lua.1
	src/Externals/luajit/doc/lua.css
	src/Externals/luajit/doc/lua.html
	src/Externals/luajit/doc/luac.1
	src/Externals/luajit/doc/luac.html
	src/Externals/luajit/doc/manual.css
	src/Externals/luajit/doc/manual.html
	src/Externals/luajit/doc/readme.html
	src/Externals/luajit/dynasm/dasm_proto.h
	src/Externals/luajit/dynasm/dasm_x86.h
	src/Externals/luajit/dynasm/dasm_x86.lua
	src/Externals/luajit/dynasm/dynasm.lua
	src/Externals/luajit/etc/README
	src/Externals/luajit/etc/lua.hpp
	src/Externals/luajit/etc/luajit.ico
	src/Externals/luajit/etc/luajit.pc
	src/Externals/luajit/etc/luavs.bat
	src/Externals/luajit/etc/strict.lua
	src/Externals/luajit/jit/dis_x86.lua
	src/Externals/luajit/jit/dump.lua
	src/Externals/luajit/jit/dumphints.lua
	src/Externals/luajit/jit/opt.lua
	src/Externals/luajit/jit/opt_inline.lua
	src/Externals/luajit/jit/trace.lua
	src/Externals/luajit/jitdoc/bluequad-print.css
	src/Externals/luajit/jitdoc/bluequad.css
	src/Externals/luajit/jitdoc/coco.html
	src/Externals/luajit/jitdoc/coco_api.html
	src/Externals/luajit/jitdoc/coco_changes.html
	src/Externals/luajit/jitdoc/coco_portability.html
	src/Externals/luajit/jitdoc/contact.html
	src/Externals/luajit/jitdoc/dynasm.html
	src/Externals/luajit/jitdoc/dynasm_examples.html
	src/Externals/luajit/jitdoc/dynasm_features.html
	src/Externals/luajit/jitdoc/img/backbar.png
	src/Externals/luajit/jitdoc/img/bluebar.png
	src/Externals/luajit/jitdoc/img/contact.png
	src/Externals/luajit/jitdoc/img/magentabar.png
	src/Externals/luajit/jitdoc/img/spacer.png
	src/Externals/luajit/jitdoc/index.html
	src/Externals/luajit/jitdoc/luajit.html
	src/Externals/luajit/jitdoc/luajit_api.html
	src/Externals/luajit/jitdoc/luajit_changes.html
	src/Externals/luajit/jitdoc/luajit_debug.html
	src/Externals/luajit/jitdoc/luajit_features.html
	src/Externals/luajit/jitdoc/luajit_install.html
	src/Externals/luajit/jitdoc/luajit_intro.html
	src/Externals/luajit/jitdoc/luajit_performance.html
	src/Externals/luajit/jitdoc/luajit_run.html
	src/Externals/luajit/lua.JIT.1.1.4.icproj
	src/Externals/luajit/lua.JIT.1.1.4.vcxproj
	src/Externals/luajit/lua.JIT.1.1.4.vcxproj.filters
	src/Externals/luajit/src/Makefile
	src/Externals/luajit/src/lapi.c
	src/Externals/luajit/src/lapi.h
	src/Externals/luajit/src/lauxlib.c
	src/Externals/luajit/src/lbaselib.c
	src/Externals/luajit/src/lcoco.c
	src/Externals/luajit/src/lcoco.h
	src/Externals/luajit/src/lcode.c
	src/Externals/luajit/src/lcode.h
	src/Externals/luajit/src/ldblib.c
	src/Externals/luajit/src/ldebug.c
	src/Externals/luajit/src/ldebug.h
	src/Externals/luajit/src/ldo.c
	src/Externals/luajit/src/ldo.h
	src/Externals/luajit/src/ldump.c
	src/Externals/luajit/src/lfunc.c
	src/Externals/luajit/src/lfunc.h
	src/Externals/luajit/src/lgc.c
	src/Externals/luajit/src/lgc.h
	src/Externals/luajit/src/linit.c
	src/Externals/luajit/src/liolib.c
	src/Externals/luajit/src/ljit.h
	src/Externals/luajit/src/ljit_backend.c
	src/Externals/luajit/src/ljit_core.c
	src/Externals/luajit/src/ljit_dasm.c
	src/Externals/luajit/src/ljit_dasm.h
	src/Externals/luajit/src/ljit_hints.h
	src/Externals/luajit/src/ljit_mem.c
	src/Externals/luajit/src/ljit_x86.dasc
	src/Externals/luajit/src/ljit_x86.dash
	src/Externals/luajit/src/ljit_x86.h
	src/Externals/luajit/src/ljit_x86_inline.dash
	src/Externals/luajit/src/ljitlib.c
	src/Externals/luajit/src/llex.c
	src/Externals/luajit/src/llex.h
	src/Externals/luajit/src/llimits.h
	src/Externals/luajit/src/lmathlib.c
	src/Externals/luajit/src/lmem.c
	src/Externals/luajit/src/lmem.h
	src/Externals/luajit/src/loadlib.c
	src/Externals/luajit/src/lobject.c
	src/Externals/luajit/src/lobject.h
	src/Externals/luajit/src/lopcodes.c
	src/Externals/luajit/src/lopcodes.h
	src/Externals/luajit/src/loslib.c
	src/Externals/luajit/src/lparser.c
	src/Externals/luajit/src/lparser.h
	src/Externals/luajit/src/lstate.c
	src/Externals/luajit/src/lstate.h
	src/Externals/luajit/src/lstring.c
	src/Externals/luajit/src/lstring.h
	src/Externals/luajit/src/lstrlib.c
	src/Externals/luajit/src/ltable.c
	src/Externals/luajit/src/ltable.h
	src/Externals/luajit/src/ltablib.c
	src/Externals/luajit/src/ltm.c
	src/Externals/luajit/src/ltm.h
	src/Externals/luajit/src/lua.c
	src/Externals/luajit/src/luac.c
	src/Externals/luajit/src/luajit.h
	src/Externals/luajit/src/lundump.c
	src/Externals/luajit/src/lundump.h
	src/Externals/luajit/src/lvm.c
	src/Externals/luajit/src/lvm.h
	src/Externals/luajit/src/lzio.c
	src/Externals/luajit/src/lzio.h
	src/Externals/luajit/src/print.c
	src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj
	src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj
	src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj
	src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj
	src/xrEngine/xrEngine.vcxproj
	src/xrGame/xrGame.vcxproj
	src/xrScriptEngine/xrScriptEngine.vcxproj

.gitignore

@@ -9,3 +9,19 @@ 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

doc/design/task_list.txt

@@ -162,3 +162,23 @@ Highflex: Alex M
   - Python scripts for stalker skeleton control rig creation
 - game code
   - Improve Weapon System ( Additional Animations, Options )
+
+Swartz27: Matthew Swartz
++ Fix blurred text on R4
++ Fix issue #24: Fix overloaded particle system
++ Fix sun path not following weather configs in R2-R4
+* Add actor shadow to R2-R4
+* Add grass shadows (r2_sun_details) to R2-R4
+* Add zoom and reload DOF which is read from the weapon configs if present
+- Add "sunmask"/cloud shadows shaders for R3&R4
+  - Disable loading of pre-compiled shaders on R3/R4 to allow for loading of new/modifed shaders
+    - Have game automatically delete shaders_cache whenever there is a new shader or modifed shader
+  - Add a console command to turn cloud shadows on or off (requires restart)
+- Add soft shadows shader to R2 (original author: cj ayho)
+- Add console command for enabling manual reloading on weapons
+? Remove R1 renderer and all references to it
++ Increase vertex buffer size from 1024+512 to 4096
++ Add console command to change shadow map size via console (options: 1024, 1536, 2048[vanilla default], 2560, 3072, 4096)
++ Extend r__geometry_lod from 1.2f to 5.f
+* Fix problem with weapons using a grenade launcher not lerping the animations
++ Fixed skybox stretching

doc/howto/build.txt

@@ -2,9 +2,8 @@ TITLE: X-Ray 1.6 build and setup instructions
 
 Build:
 ------
-By default, all libraries mentioned below (except Windows/DirectX SDK) are assumed to be in the directory
-defined by XRAY_16X_LIBS environment variable. It can be set with following command (run as administrator):
-  $ setx XRAY_16X_LIBS E:\dev\ /M
+By default, all libraries mentioned below (except Windows/DirectX SDK) are assumed to be in
+the src\Externals directory.
 
 To build X-Ray Engine you'll need following libraries:
 * OpenSSL: https://www.openssl.org/source
@@ -45,10 +44,10 @@ Setup:
   - eax.dll
   - wrap_oal.dll
 - For _bin_rel and _bin_mix:
-  - Copy BugTrap.dll from %XRAY_16X_LIBS%BugTrap\Bin
+  - Copy BugTrap.dll from src\Externals\BugTrap\Bin
 - For _bin_dbg:
-  - Copy BugTrapD.dll from %XRAY_16X_LIBS%BugTrap\Bin and rename it to BugTrap.dll
-- Copy following files from %XRAY_16X_LIBS%OpenSSL\bin to _bin_dbg, _bin_mix and _bin_rel:
+  - 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:
   - libeay32.dll
   - ssleay32.dll
 - Create soft link to /gamedata in the game installation directory: