Merge branch 'dev' of https://dev.ds-servers.com/sip/engine into dev

build/editor.cfg

build/gamesource/shaders/ppe/ppe_dlaa_long.ps

build/gamesource/shaders/ppe/ppe_dlaa_small.ps

build/gamesource/shaders/ppe/ppe_edge_detected.ps

build/gamesource/shaders/ppe/ppe_fog_linear.ps

build/gamesource/shaders/ppe/ppe_nfaa.ps

build/sysconfig.cfg

docs/settings_doxygen/Doxyfile

docs/settings_doxygen/logo.png

proj/SkyXEngine/vs2013/SkyXEngine.vcxproj

proj/SkyXEngine/vs2013/SkyXEngine.vcxproj.filters

source/GRegisterIndex.h

source/SkyXEngine.h

source/game/GameData.cpp

source/game/SXbaseEntity.cpp

source/game/crosshair.cpp

source/game/proptable.h

source/game/sxgame.h

source/game/sxgame_dll.cpp

source/gcore/sxgcore.cpp