Merge branch 'origin/branchX'

.gitignore

@@ -192,6 +192,7 @@ ModelManifest.xml
 
 *.phpt
 libs/
+libs64/
 
 source/s4g/tests/failed/
 source/s4g/tests/
@@ -202,10 +203,13 @@ source/s4g/tests/
 *.sxf
 
 build/*
+!engine/
+!demos/
 !gamesource/
 build/gamesource/*
 /build/gamesource/shaders/cache/*
 !shaders/
+!gui/
 docs/html/*
 !docs/html/material_editor/
 !docs/html/particles_editor/
@@ -217,3 +221,4 @@ docs/html/*
 /build/config_game_user.cfg
 
 /sdks/freetype-2.6/objs/
+/sdks/freetype-2.10.0/objs/

.gitmodules

 [submodule "sdks/bullet3"]
 	path = sdks/bullet3
-	url = https://root@dev.ds-servers.com/sip/bullet3.git
+	url = https://dev.ds-servers.com/sip/bullet3.git
 [submodule "source/common"]
 	path = source/common
-	url = https://root@dev.ds-servers.com/sip/common.git
+	url = https://dev.ds-servers.com/sip/common.git
+[submodule "sdks/graphix"]
+	path = sdks/graphix
+	url = https://dev.ds-servers.com/sip/graphix.git

build/config_editor.cfg

@@ -9,3 +9,5 @@ r_stats 1
 hud_draw 0
 hud_crosshair 0
 hud_rangefinder 0
+
+cl_mousesense 4.5

build/config_game.cfg

@@ -30,6 +30,6 @@ r_pssm_shadowed 1
 r_shadow_soft 1
 pssm_4or3 0
 
-exec ../config_game_user_auto.cfg
+exec user_settings.cfg
 
 spawn
\ No newline at end of file

build/config_sys.cfg

@@ -28,7 +28,7 @@ grass_frec 100
 green_lod0 50
 green_lod1 100
 green_less 20
-r_far 400
+// r_far 400
 
 r_s_filter 2
 r_s_max_anisotropy 16

build/demos/levels/transparent/transparent.ent

+[ent_0]
+team = -842150451
+rotation = 0.000000 0.000000 0.000000 1.000000
+parent = 
+origin = -3.925758 1.000896 -18.142702
+name = 
+flags = 0
+classname = info_player_spawn
+
+[ent_1]
+use_trimesh = 0
+skin = 0
+scale = 1.000000
+rotation = 0.000000 0.081049 0.000000 -0.996710
+parent = 
+origin = -6.353374 3.468264 6.488859
+name = 
+model = meshes/transparent/plane1.dse
+is_static = 1
+glow_color_ref = 
+glow_color = 0.000000 0.000000 0.000000
+flags = 0
+classname = prop_static
+auto_physbox = 1
+
+[meta]
+count = 10
+
+[ent_2]
+use_trimesh = 0
+skin = 0
+scale = 1.000000
+rotation = 0.000000 0.081049 0.000000 -0.996710
+parent = 
+origin = -9.025822 3.468264 -9.834812
+name = 
+model = meshes/transparent/plane1.dse
+is_static = 1
+glow_color_ref = 
+glow_color = 0.000000 0.000000 0.000000
+flags = 0
+classname = prop_static
+auto_physbox = 1
+
+[ent_3]
+use_trimesh = 1
+skin = 0
+scale = 1.000000
+rotation = 0.000000 0.000000 0.000000 1.000000
+parent = 
+origin = 0.000000 0.000000 0.000000
+name = base
+model = meshes/transparent/base.dse
+is_static = 1
+glow_color_ref = 
+glow_color = 0.000000 0.000000 0.000000
+flags = 0
+classname = prop_static
+auto_physbox = 1
+
+[ent_4]
+use_trimesh = 0
+skin = 0
+scale = 1.000000
+rotation = 0.000000 -0.029537 0.000000 -0.999564
+parent = 
+origin = 0.551506 3.468264 -6.024114
+name = 
+model = meshes/transparent/plane2.dse
+is_static = 1
+glow_color_ref = 
+glow_color = 0.000000 0.000000 0.000000
+flags = 0
+classname = prop_static
+auto_physbox = 1
+
+[ent_5]
+use_trimesh = 0
+skin = 0
+scale = 1.000000
+rotation = 0.000000 0.682918 0.000000 -0.730495
+parent = 
+origin = -4.130323 3.495506 -11.273858
+name = 
+model = meshes/transparent/plane2.dse
+is_static = 1
+glow_color_ref = 
+glow_color = 0.000000 0.000000 0.000000
+flags = 0
+classname = prop_static
+auto_physbox = 1
+
+[ent_6]
+use_trimesh = 0
+skin = 0
+scale = 2.000000
+rotation = 0.000000 0.000000 0.000000 1.000000
+parent = 
+origin = -6.141287 0.000000 6.633917
+name = 
+model = meshes/transparent/box3.dse
+is_static = 1
+glow_color_ref = 
+glow_color = 0.000000 0.000000 0.000000
+flags = 0
+classname = prop_static
+auto_physbox = 1
+
+[ent_7]
+use_trimesh = 0
+skin = 0
+scale = 2.000000
+rotation = 0.000000 0.000000 0.000000 1.000000
+parent = 
+origin = -0.163496 0.000000 7.586028
+name = 
+model = meshes/transparent/box1.dse
+is_static = 1
+glow_color_ref = 
+glow_color = 0.000000 0.000000 0.000000
+flags = 0
+classname = prop_static
+auto_physbox = 1
+
+[ent_8]
+use_trimesh = 0
+skin = 0
+scale = 2.000000
+rotation = 0.000000 0.000000 0.000000 1.000000
+parent = 
+origin = -9.934603 0.000000 15.668315
+name = 
+model = meshes/transparent/box2.dse
+is_static = 1
+glow_color_ref = 
+glow_color = 0.000000 0.000000 0.000000
+flags = 0
+classname = prop_static
+auto_physbox = 1
+
+[ent_9]
+use_trimesh = 0
+skin = 0
+scale = 2.000000
+rotation = 0.000000 0.000000 0.000000 1.000000
+parent = 
+origin = -9.126783 0.000000 -11.453623
+name = 
+model = meshes/transparent/box1.dse
+is_static = 1
+glow_color_ref = 
+glow_color = 0.000000 0.000000 0.000000
+flags = 0
+classname = prop_static
+auto_physbox = 1

build/demos/levels/transparent/transparent.lvl

+[level]
+type = indoor
+local_name = transparent
+
+[terrax]
+vp_layout = 0
+grid_step = 6
+grid_show = 1
+cam3_view = 1
+cam3_scale = 0.017939
+cam3_pos = -5.900388 -2.482251 -1000.000000
+cam3_dir = -0.000000 -0.000000 -0.000000