 Teejoon
|
8151e9a9a4
|
Merge branch 'master' into DDS
Conflicts:
assets
include/Engine/Core/ResourceManager.h
include/Engine/Rendering/Image.h
include/Engine/Rendering/TextureSprite.h
resources/Schema/Entities/MovementTest.xml
resources/Shaders/ForwardPlus.frag.glsl
resources/Shaders/ForwardPlusShieldCheck.frag.glsl
src/Engine/Rendering/CubeMapPass.cpp
src/Engine/Rendering/Texture.cpp
src/Game/Game.cpp
|
2016-03-14 02:51:45 +01:00 |
|
|
Teejoon
|
958850903a
|
Moved ViewSpacePosition calculation from fragmenst shader to vertexshader
|
2016-03-13 00:08:49 +01:00 |
|
|
Teejoon
|
d6f0528a87
|
2 more shaders with DTX5nm calculations
|
2016-03-10 20:03:13 +01:00 |
|
 FakeShemp
|
e25c9ee690
|
Merge remote-tracking branch 'origin/master' into Shadows
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.vert.glsl
# resources/Shaders/ForwardPlusSkinned.vert.glsl
# src/Engine/Rendering/Renderer.cpp
|
2016-03-09 19:38:55 +01:00 |
|
|
Teejoon
|
155d700a44
|
WIP
|
2016-03-08 16:19:56 +01:00 |
|
|
FakeShemp
|
2049d630e9
|
Revert "Revert "Shadows""
This reverts commit 73b8bff1f3.
|
2016-03-07 19:45:46 +01:00 |
|
 Tleety
|
47ece6a5bf
|
Changed shield component to track Active, so it and sprint glow full if they are active.
Changed how reflections are calculated with light.
|
2016-03-07 14:42:50 +01:00 |
|
|
Teejoon
|
ef66f3ebe5
|
Transparancy with shild fix
|
2016-03-01 23:14:23 +01:00 |
|