Skip to content

Commit 6ae51b1

Browse files
author
nitrocaster
committed
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
2 parents e281e85 + 7048f0a commit 6ae51b1

File tree

3,402 files changed

+253
-559632
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,402 files changed

+253
-559632
lines changed

.gitignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,19 @@ intermediate/
99
intermediate_plugs/
1010
lib/
1111
*.aps
12+
13+
# exclude all third-party libraries
14+
src/Externals/3dsmax
15+
src/Externals/BugTrap
16+
src/Externals/FreeImage
17+
src/Externals/jpeg
18+
src/Externals/libogg-1.1.4
19+
src/Externals/libtheora-1.1.1
20+
src/Externals/libvorbis-1.2.3
21+
src/Externals/lightwave
22+
src/Externals/MagicSoftware
23+
src/Externals/maya
24+
src/Externals/nvapi
25+
src/Externals/OpenAutomate
26+
src/Externals/OpenSSL
27+
src/Externals/zlib

doc/design/task_list.txt

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

doc/howto/build.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ TITLE: X-Ray 1.6 build and setup instructions
22

33
Build:
44
------
5-
By default, all libraries mentioned below (except Windows/DirectX SDK) are assumed to be in the directory
6-
defined by XRAY_16X_LIBS environment variable. It can be set with following command (run as administrator):
7-
$ setx XRAY_16X_LIBS E:\dev\ /M
5+
By default, all libraries mentioned below (except Windows/DirectX SDK) are assumed to be in
6+
the src\Externals directory.
87

98
To build X-Ray Engine you'll need following libraries:
109
* OpenSSL: https://www.openssl.org/source
@@ -45,10 +44,10 @@ Setup:
4544
- eax.dll
4645
- wrap_oal.dll
4746
- For _bin_rel and _bin_mix:
48-
- Copy BugTrap.dll from %XRAY_16X_LIBS%BugTrap\Bin
47+
- Copy BugTrap.dll from src\Externals\BugTrap\Bin
4948
- For _bin_dbg:
50-
- Copy BugTrapD.dll from %XRAY_16X_LIBS%BugTrap\Bin and rename it to BugTrap.dll
51-
- Copy following files from %XRAY_16X_LIBS%OpenSSL\bin to _bin_dbg, _bin_mix and _bin_rel:
49+
- Copy BugTrapD.dll from src\Externals\BugTrap\Bin and rename it to BugTrap.dll
50+
- Copy following files from src\Externals\OpenSSL\bin to _bin_dbg, _bin_mix and _bin_rel:
5251
- libeay32.dll
5352
- ssleay32.dll
5453
- Create soft link to /gamedata in the game installation directory:

res/gamedata/configs/alife.ltx

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)