 Teejoon
|
43719f8304
|
Added texture tiling to shaders (exkluding ExplosinEffects)
|
2016-02-07 15:27:26 +01:00 |
|
 Jace
|
bd2da7bc9f
|
Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""
This reverts commit b56824786c.
|
2016-02-03 16:30:00 +01:00 |
|
|
Jace
|
b56824786c
|
Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping"
This reverts commit 192de80782, reversing
changes made to 24aac6a00d.
|
2016-02-03 16:16:06 +01:00 |
|
 Tleety
|
12a181c1ff
|
Fixed a bug where normals scaled with model scale. Again.
|
2016-02-02 16:11:03 +01:00 |
|
|
Tleety
|
9c2e459e0c
|
Deatheffect color now correctly calculated
|
2016-02-02 10:58:00 +01:00 |
|
|
Tleety
|
ed7d00c1d8
|
Bug where widgets did not get their ambient light now fixed.
|
2016-02-01 18:19:38 +01:00 |
|
|
Tleety
|
53cae25eb2
|
WIP on widget fuckery
|
2016-02-01 16:56:55 +01:00 |
|
|
Tleety
|
7054822be2
|
SceneLight component now working
|
2016-02-01 11:12:03 +01:00 |
|
|
Tleety
|
97cbc55223
|
Some debug features for color corrections and glow strength fix.
|
2016-01-27 17:21:00 +01:00 |
|
|
Tleety
|
44302bb0f3
|
Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component
|
2016-01-27 15:38:54 +01:00 |
|
|
Tleety
|
a954cbbf50
|
Normal map support
|
2016-01-27 13:52:27 +01:00 |
|
|
Jace
|
7e12d00874
|
Merge branch 'master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-27 10:43:23 +01:00 |
|
 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
|
ada1bac2a7
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-24 20:48:17 +01:00 |
|
 antc13
|
666f1fd878
|
Removed temp variables & the "forced" animation in DrawFinalPass
|
2016-01-24 15:30:20 +01:00 |
|
|
viktorljung
|
fcba0a28b8
|
Merge branch 'master' into Menu
|
2016-01-23 18:27:48 +01:00 |
|
|
Tleety
|
5edf5a41f1
|
Transparency bug fix
|
2016-01-23 16:45:26 +01:00 |
|
|
viktorljung
|
aacfc47fb5
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
|
2016-01-23 15:12:19 +01:00 |
|
|
viktorljung
|
680a12d88f
|
HealthMeter
|
2016-01-23 14:53:17 +01:00 |
|
|
Tleety
|
caf55fb8d1
|
Small fix to the bloom light, now feels smoother.
|
2016-01-22 10:52:45 +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
|
70bbc5ed0a
|
Normals scaling with model scale bug fixed.
|
2016-01-21 13:52:43 +01:00 |
|
|
Tleety
|
86824f1b1f
|
Colors above value 1 is now added to the bloomtexture, and will be used to get a glow effect in later stage.
|
2016-01-20 15:23:49 +01:00 |
|
|
Tleety
|
78a1037983
|
WIP
DrawScreenQuad implemented and working.
Started work on HDR coloring.
|
2016-01-20 13:34:56 +01:00 |
|
|
Tleety
|
5d6d0f82b9
|
Removed some debug code
|
2016-01-19 16:48:59 +01:00 |
|
|
Tleety
|
982837052a
|
DirectionalLight now correctly getting directions
|
2016-01-19 14:44:17 +01:00 |
|
|
Tleety
|
46e17b7e0d
|
Working directional light
|
2016-01-19 12:32:34 +01:00 |
|
 Ayumiwii
|
77e1dacb6f
|
Merge
|
2016-01-19 09:58:52 +01:00 |
|
|
Tleety
|
4b29d48f27
|
WIP
|
2016-01-18 17:57:45 +01:00 |
|
|
Tleety
|
601ce85c05
|
WIP
|
2016-01-18 16:50:41 +01:00 |
|
|
Tleety
|
4092f6b4d4
|
New Lightstruct working.
|
2016-01-18 14:20:28 +01:00 |
|
|
Tleety
|
3de853ac8b
|
Frustum culling now works correctly for all resolutions
|
2016-01-15 15:38:14 +01:00 |
|
|
Tleety
|
24ba3ae1f6
|
WIP, falloff things.
# Conflicts:
# resources/Schema/Components/PointLight.xsd
# resources/Shaders/ForwardPlus.frag.glsl
|
2016-01-11 17:57:15 +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
|
069a6756b9
|
LightcullingPass for forward+ is now separate from Renderer.cpp.
|
2015-12-18 14:31:16 +01:00 |
|
|
viktorljung
|
6cf7c12d34
|
Forward+ working
|
2015-12-18 11:09:54 +01:00 |
|
|
viktorljung
|
4a817613e3
|
Forward+ semi working
|
2015-12-17 17:55:44 +01:00 |
|
|
viktorljung
|
6a3c14540d
|
fixes
|
2015-12-17 10:38:13 +01:00 |
|
|
viktorljung
|
5602b32507
|
Forward+ Fixes
|
2015-12-16 13:36:38 +01:00 |
|
|
Tleety
|
1e370bac13
|
ForwardPlus base debug commit.
|
2015-12-15 15:28:37 +01:00 |
|