Commit 6ae51b1
nitrocaster
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.vcxprojFile tree
3,402 files changed
+253
-559632
lines changed- doc
- design
- howto
- res/gamedata
- configs
- creatures
- environment
- ambients
- fog
- weather_effects
- weathers
- gameplay
- misc
- outfit_upgrades
- trade
- models
- capture
- objects
- vehicles
- weapons
- mp
- soundmessages
- weapons_mp
- prefetch
- scripts
- evac
- smart
- jupiter
- anomaly
- smart
- labx8
- pripyat
- anomaly
- smart
- underpass
- smart
- zaton
- anomaly
- smart
- text
- cze
- eng
- fra
- ger
- ita
- pol
- rus
- spa
- ukr
- ui
- textures_descr
- weapons
- upgrades
- weathers
- zones
- scripts
- shaders
- r1
- old
- test
- r2
- test
- r3
- dx11
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| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | | - | |
| 5 | + | |
| 6 | + | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
| |||
45 | 44 | | |
46 | 45 | | |
47 | 46 | | |
48 | | - | |
| 47 | + | |
49 | 48 | | |
50 | | - | |
51 | | - | |
| 49 | + | |
| 50 | + | |
52 | 51 | | |
53 | 52 | | |
54 | 53 | | |
| |||
This file was deleted.
0 commit comments