BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into AndersTest

Browse Source 
# Conflicts:
#	include/Engine/Core/InputController.h
#	include/Game/Game.h
This commit is contained in:
verysecrethero
2015-12-15 11:32:47 +01:00
parent bf08ffe392 51dd627ae3
commit f9508657f5
82 changed files with 2956 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/deploy.bat
+3
View File
@@ -11,6 +11,8 @@ RMDIR "%DeployLocation%\Textures"
MKLINK "%DeployLocation%\Textures\" "assets\Textures\" /J
RMDIR "%DeployLocation%\Audio"
MKLINK "%DeployLocation%\Audio\" "assets\Audio\" /J
RMDIR "%DeployLocation%\Fonts"
MKLINK "%DeployLocation%\Fonts\" "assets\Fonts\" /J
ECHO Deploying resources to %DeployLocation%
:: Schemas
@@ -21,6 +23,7 @@ RMDIR /S /Q "%DeployLocation%\Shaders"
MKLINK "%DeployLocation%\Shaders\" "resources\Shaders" /J
:: Configuration files
MKLINK "%DeployLocation%\DefaultConfig.ini" "resources\DefaultConfig.ini" /H
MKLINK "%DeployLocation%\DefaultInput.ini" "resources\DefaultInput.ini" /H
:: Platform specific binaries
IF "%~1"=="" GOTO :EOF