Merge branch 'master' into VXP

# Conflicts: # .gitignore
2025-04-08 11:01:33 +00:00 · 2016-09-08 17:21:47 -05:00 · 2016-09-08 17:21:47 -05:00 · ddb3bddd2b
commit ddb3bddd2b
parent f79fe85031 8fdc42e302
9 changed files with 2 additions and 2272 deletions
--- a/sp/game/sdk2013CE/bin/game_shader_generic_eshader_2007.dll
+++ b/sp/game/sdk2013CE/bin/game_shader_generic_eshader_2007.dll
--- a/sp/game/sdk2013CE/bin/game_shader_generic_eshader_swarm.dll
+++ b/sp/game/sdk2013CE/bin/game_shader_generic_eshader_swarm.dll
--- a/sp/game/sdk2013CE/bin/shadereditor_2007.dll
+++ b/sp/game/sdk2013CE/bin/shadereditor_2007.dll
--- a/sp/game/sdk2013CE/bin/shadereditor_swarm.dll
+++ b/sp/game/sdk2013CE/bin/shadereditor_swarm.dll
--- a/sp/game/sdk2013CE/ep1_gamestats.dat
+++ b/sp/game/sdk2013CE/ep1_gamestats.dat
--- a/sp/game/sdk2013CE/mapsrc/testbox.bsp
+++ b/sp/game/sdk2013CE/mapsrc/testbox.bsp
--- a/sp/game/sdk2013CE/mapsrc/testbox.prt
+++ b/sp/game/sdk2013CE/mapsrc/testbox.prt
@ -1,21 +0,0 @@
-PRT1
-11
-18
-4 0 1 (254 1024 64.023300 ) (254 1024 748 ) (2 1024 748 ) (2 1024 64.023300 ) 
-4 1 3 (254 512 64.023300 ) (254 512 748 ) (2 512 748 ) (2 512 64.023300 ) 
-4 2 4 (510 0 64 ) (510 0 750 ) (256 0 750 ) (256 0 64 ) 
-4 2 3 (256 0 64 ) (256 0 750 ) (256 510 750 ) (256 510 64 ) 
-4 3 9 (0 0 64 ) (0 0 750 ) (0 510 750 ) (0 510 64 ) 
-4 3 5 (152 0 750 ) (104 0 750 ) (104 0 64 ) (152 0 64 ) 
-4 3 4 (256 0 64 ) (256 0 750 ) (152 0 750 ) (152 0 64 ) 
-4 3 8 (104 0 750 ) (0 0 750 ) (0 0 64 ) (104 0 64 ) 
-4 4 6 (152 -192 168 ) (152 -192 750 ) (152 -80 750 ) (152 -80 168 ) 
-4 4 5 (152 0 64 ) (152 -80 64 ) (152 -80 750 ) (152 0 750 ) 
-4 4 7 (152 -192 64 ) (152 -510 64 ) (152 -510 750 ) (152 -192 750 ) 
-4 5 6 (104 -80 750 ) (104 -80 168 ) (152 -80 168 ) (152 -80 750 ) 
-4 5 8 (104 0 64 ) (104 -80 64 ) (104 -80 750 ) (104 0 750 ) 
-4 6 8 (104 -192 168 ) (104 -192 750 ) (104 -80 750 ) (104 -80 168 ) 
-4 6 7 (104 -192 750 ) (104 -192 168 ) (152 -192 168 ) (152 -192 750 ) 
-4 7 8 (104 -192 64 ) (104 -510 64 ) (104 -510 750 ) (104 -192 750 ) 
-4 8 10 (0 -510 64 ) (0 -510 750 ) (0 0 750 ) (0 0 64 ) 
-4 9 10 (0 0 64 ) (0 0 750 ) (-510 0 750 ) (-510 0 64 ) 
--- a/sp/game/sdk2013CE/mapsrc/testbox.vmx
+++ b/sp/game/sdk2013CE/mapsrc/testbox.vmx
--- a/sp/src/msbuild.bat
+++ b/sp/src/msbuild.bat
@ -1,6 +1,6 @@
@echo off

 :: Version 12.0
-"%ProgramFiles(x86)%\MSBuild\12.0\Bin\msbuild.exe" %cd%\sdk2013ce.sln
+"%ProgramFiles(x86)%\MSBuild\12.0\Bin\msbuild.exe" "%cd%\sdk2013ce.sln"

-pause
+pause