 FakeShemp
|
6c072aae45
|
Merge remote-tracking branch 'origin/master' into ExplosionEffectV2
# Conflicts:
# resources/Schema/Components/ExplosionEffect.xml
# resources/Shaders/ExplosionEffect.geom.glsl
# src/Game/Systems/ExplosionEffectSystem.cpp
|
2016-03-10 11:49:51 +01:00 |
|
|
FakeShemp
|
68634126e5
|
Add moar optimization thingies and some xml clarifications
|
2016-03-10 11:43:11 +01:00 |
|
|
FakeShemp
|
ee99821164
|
Add reverse and scalar for ColorByDistance
|
2016-03-07 15:45:06 +01:00 |
|
|
FakeShemp
|
53ea5bd37d
|
comment out currently unused thing
|
2016-03-07 14:15:17 +01:00 |
|
 Teejoon
|
b38ebbe676
|
Shadows now working on NVIDIA cards too
|
2016-03-07 14:00:08 +01:00 |
|
|
FakeShemp
|
315eac1af9
|
try not to assume things.
|
2016-03-03 15:10:27 +01:00 |
|
|
FakeShemp
|
0cf92e99ff
|
wip
|
2016-03-02 10:17:49 +01:00 |
|
|
FakeShemp
|
22c391df54
|
Initial work on texture arrays
|
2016-02-26 17:40:35 +01:00 |
|
|
FakeShemp
|
8867e7ac3c
|
Working shadows, no cascade blend yet
|
2016-02-25 20:29:41 +01:00 |
|
|
FakeShemp
|
fb80d088e4
|
Redid many a thing for the sake of efficiency
|
2016-02-23 10:06:21 +01:00 |
|
 Ayumiwii
|
cb7f06573f
|
Shadows stage 2 WIP
|
2016-02-09 14:08:57 +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
|
9c2e459e0c
|
Deatheffect color now correctly calculated
|
2016-02-02 10:58:00 +01:00 |
|
|
Tleety
|
53cae25eb2
|
WIP on widget fuckery
|
2016-02-01 16:56:55 +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 |
|
|
Ayumiwii
|
382e00cff4
|
Randomness fixed
Redundant continue removed
Redundant cross product removed
|
2016-01-21 15:34:08 +01:00 |
|
|
Ayumiwii
|
77e1dacb6f
|
Merge
|
2016-01-19 09:58:52 +01:00 |
|
|
Ayumiwii
|
35269315cc
|
Rename the thingie
|
2016-01-18 13:51:32 +01:00 |
|