 stiffly
|
44baa47bba
|
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Common.h
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-25 01:21:15 +01:00 |
|
 viktorljung
|
ef020a3770
|
Text fixed
|
2016-01-23 18:17:20 +01:00 |
|
|
viktorljung
|
160b7183b2
|
WIP
|
2016-01-23 18:07:07 +01:00 |
|
 Tleety
|
f623232a2b
|
Removed a temp variable.
|
2016-01-23 14:52:29 +01:00 |
|
|
Tleety
|
b499f4b020
|
Fixed some rendering bugs and some code refactoring
|
2016-01-23 12:17:38 +01:00 |
|
|
Tleety
|
2b8debbfff
|
Added MipMap texture generation
|
2016-01-22 15:55:32 +01:00 |
|
|
Tleety
|
afe43c5f44
|
Shader will now handle Glowmaps. However the load code is not there yet.
|
2016-01-21 14:53:47 +01:00 |
|
|
Tleety
|
78a1037983
|
WIP
DrawScreenQuad implemented and working.
Started work on HDR coloring.
|
2016-01-20 13:34:56 +01:00 |
|
 Ayumiwii
|
77e1dacb6f
|
Merge
|
2016-01-19 09:58:52 +01:00 |
|
|
Tleety
|
ecf524eb4e
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/PickingPass.h
# include/Engine/Rendering/Renderer.h
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-01-15 11:01:58 +01:00 |
|
|
Tleety
|
0cf8d26557
|
Revert "Revert "Forward+""
This reverts commit b908a9f9c6.
|
2016-01-11 17:56:58 +01:00 |
|
 Jace
|
b908a9f9c6
|
Revert "Forward+"
|
2016-01-11 13:48:55 +01:00 |
|
|
Tleety
|
e510f2b88c
|
Forward plus render pass now removed from Renderer.cpp to it's own class.
|
2016-01-06 11:32:42 +01:00 |
|