mirror of
https://github.com/ptitSeb/Serious-Engine
synced 2024-11-26 04:05:53 +01:00
1a2ccb8f50
Conflicts: Sources/Ecc/Parser.cpp Sources/Ecc/Scanner.cpp Sources/Engine/Base/Scanner.cpp Sources/Engine/GameAgent/GameAgent.cpp Sources/Engine/Graphics/Gfx_wrapper.h Sources/Engine/Network/Network.cpp Sources/Engine/Sound/SoundDecoder.h Sources/Engine/Templates/HashTableTemplate.cpp Sources/Engine/Terrain/Terrain.h Sources/EntitiesMP/ParticleCloudsHolder.es Sources/EntitiesMP/ParticleCloudsMarker.es Sources/SeriousSam/CDCheck.h Sources/SeriousSam/Menu.cpp Sources/SeriousSam/MenuGadgets.cpp Sources/SeriousSam/SeriousSam.cpp Sources/SeriousSam/SplashScreen.cpp Sources/SeriousSam/StdH.cpp Sources/SeriousSam/StdH.h Sources/Shaders/StdH.cpp |
||
---|---|---|
.. | ||
AddShader.cpp | ||
AddShaderDS.cpp | ||
BaseShader.cpp | ||
BaseShaderDS.cpp | ||
BaseTransparent.cpp | ||
BaseTransparentDS.cpp | ||
ColorShader.cpp | ||
Common.cpp | ||
Common.h | ||
DetailShader.cpp | ||
DisplaceShader.cpp | ||
InvisibleShader.cpp | ||
MultiLayerShader.cpp | ||
Reflection.cpp | ||
ReflectionDS.cpp | ||
ReftectionAndSpecular.cpp | ||
ReftectionAndSpecularDS.cpp | ||
Shaders.vcxproj | ||
Shaders.vcxproj.filters | ||
Shaders.vcxproj.user | ||
Specular.cpp | ||
SpecularDS.cpp | ||
StdH.cpp | ||
StdH.h | ||
Translucent.cpp |