Skip to content

Commit 5e247ea

Browse files
committed
Merge xd_dev from OpenXRay/xray-16
2 parents 0bce6a2 + 2363442 commit 5e247ea

File tree

3,817 files changed

+188208
-100783
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,817 files changed

+188208
-100783
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ intermediate/
99
intermediate_plugs/
1010
lib/
1111
*.aps
12+
*.user
13+
*.PVS-Studio.*

.gitmodules

Lines changed: 66 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,69 @@
1-
[submodule "src/Externals/luabind"]
2-
path = src/Externals/luabind
3-
url = https://github.com/vincent-t/luabind-deboostified.git
4-
[submodule "src/Externals/luajit"]
5-
path = src/Externals/luajit
6-
url = https://github.com/vincent-t/LuaJIT.git
7-
[submodule "src/Externals/GameSpy"]
8-
path = src/Externals/GameSpy
1+
[submodule "Externals/LuaJIT"]
2+
path = Externals/LuaJIT
3+
url = https://github.com/Xottab-DUTY/LuaJIT.git
4+
[submodule "Externals/luabind"]
5+
path = Externals/luabind
6+
url = https://github.com/Xottab-DUTY/luabind-deboostified.git
7+
[submodule "Externals/GameSpy"]
8+
path = Externals/GameSpy
99
url = https://github.com/nitrocaster/GameSpy.git
10-
[submodule "src/Externals/AGS_SDK"]
11-
path = src/Externals/AGS_SDK
10+
[submodule "Externals/AGS_SDK"]
11+
path = Externals/AGS_SDK
1212
url = https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK.git
13-
[submodule "src/Externals/lzo"]
14-
path = src/Externals/lzo
13+
[submodule "Externals/lzo"]
14+
path = Externals/lzo
1515
url = https://github.com/alexgdi/lzo.git
16+
[submodule "Externals/zlib"]
17+
path = Externals/zlib
18+
url = https://github.com/madler/zlib.git
19+
[submodule "Externals/libvorbis"]
20+
path = Externals/libvorbis
21+
url = https://github.com/xiph/vorbis.git
22+
[submodule "Externals/libogg"]
23+
path = Externals/libogg
24+
url = https://github.com/xiph/ogg.git
25+
[submodule "Externals/libtheora"]
26+
path = Externals/libtheora
27+
url = https://github.com/xiph/theora.git
28+
[submodule "Externals/jpeg"]
29+
path = Externals/jpeg
30+
url = https://github.com/OpenXRay/libjpeg.git
31+
[submodule "Externals/BugTrap"]
32+
path = Externals/BugTrap
33+
url = https://github.com/Xottab-DUTY/BugTrap.git
34+
[submodule "Externals/FreeImage"]
35+
path = Externals/FreeImage
36+
url = https://github.com/OpenXRay/ext-win-freeimage.git
37+
[submodule "Externals/cryptopp"]
38+
path = Externals/cryptopp
39+
url = https://github.com/weidai11/cryptopp.git
40+
[submodule "Externals/OpenAutomate"]
41+
path = Externals/OpenAutomate
42+
url = https://github.com/OpenXRay/OpenAutomate.git
43+
[submodule "Externals/FreeMagic"]
44+
path = Externals/FreeMagic
45+
url = https://github.com/OpenXRay/FreeMagic.git
46+
[submodule "Externals/lightwave"]
47+
path = Externals/lightwave
48+
url = https://github.com/OpenXRay/LightWave.git
49+
[submodule "Externals/3dsmax"]
50+
path = Externals/3dsmax
51+
url = https://github.com/OpenXRay/3dsmax.git
52+
[submodule "Externals/maya"]
53+
path = Externals/maya
54+
url = https://github.com/OpenXRay/maya.git
55+
[submodule "Externals/nvapi"]
56+
path = Externals/nvapi
57+
url = https://github.com/OpenXRay/nvapi.git
58+
[submodule "Externals/pugixml"]
59+
path = Externals/pugixml
60+
url = https://github.com/zeux/pugixml.git
61+
[submodule "Externals/glew"]
62+
path = Externals/glew
63+
url = https://github.com/Armada651/glew
64+
[submodule "Externals/gli"]
65+
path = Externals/gli
66+
url = https://github.com/g-truc/gli.git
67+
[submodule "Externals/glslang"]
68+
path = Externals/glslang
69+
url = https://github.com/KhronosGroup/glslang.git
File renamed without changes.

Externals/3dsmax

Submodule 3dsmax added at 2a5cbbd

Externals/BugTrap

Submodule BugTrap added at 6d225a3

Externals/BugTrap.vcxproj

Lines changed: 300 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)