Skip to content

Commit 5a4293c

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents bd63ca1 + 6cf9e07 commit 5a4293c

File tree

221 files changed

+966
-918
lines changed

Some content is hidden

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

221 files changed

+966
-918
lines changed

lua/autorun/client/cl_caf_autostart.lua

Lines changed: 734 additions & 693 deletions
Large diffs are not rendered by default.

lua/vgui/dcaf_collapsablecategory.lua

Lines changed: 223 additions & 216 deletions
Large diffs are not rendered by default.
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
"vertexlitgeneric"
1+
"VertexLitGeneric"
22
{
3-
"$basetexture" "ce_ls3additional/dome/glass"
4-
"$surfaceprop" "metal"
5-
"$envmaptint" "[0.5 0.5 0.5]"
6-
"$envmap" "env_cubemap"
7-
"$envmapsaturation" "0.3"
8-
"$model" "1"
9-
"$alpha" "0.5"
10-
"$translucent" "1"
3+
$basetexture "ce_ls3additional/dome/glass"
4+
$surfaceprop "metal"
5+
$envmaptint "[1 1 1]"
6+
$envmap "env_cubemap"
7+
$envmapsaturation 1
8+
$model 1
9+
$translucent 1
10+
$alpha 0.5
1111
}
-320 KB
Binary file not shown.

materials/kobol/kobol.vtf

0 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
48 Bytes
Binary file not shown.
-2.36 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-7.66 KB
Binary file not shown.
-7.66 KB
Binary file not shown.
108 Bytes
Binary file not shown.
26.3 KB
Binary file not shown.
-7.66 KB
Binary file not shown.
-33.8 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
108 Bytes
Binary file not shown.
-2.8 KB
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
40 Bytes
Binary file not shown.
-3.49 KB
Binary file not shown.
Binary file not shown.
0 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-5.85 KB
Binary file not shown.
-139 KB
Binary file not shown.
Binary file not shown.
9.13 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
112 Bytes
Binary file not shown.
-77.4 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

models/space/unit_sphere.dx80.vtx

-1.66 KB
Binary file not shown.

models/space/unit_sphere.dx90.vtx

-1.66 KB
Binary file not shown.

models/space/unit_sphere.mdl

344 Bytes
Binary file not shown.

models/space/unit_sphere.phy

-1.45 KB
Binary file not shown.

models/space/unit_sphere.sw.vtx

-1.65 KB
Binary file not shown.

models/space/unit_sphere.vvd

-4.31 KB
Binary file not shown.

0 commit comments

Comments
 (0)