 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 |
|
 Jace
|
67ce6c5ae6
|
Added Speed and Delay fields to explosion effect.
|
2016-03-07 19:38:02 +01:00 |
|
|
FakeShemp
|
ee99821164
|
Add reverse and scalar for ColorByDistance
|
2016-03-07 15:45:06 +01:00 |
|
|
FakeShemp
|
3ba73b8206
|
Pulsate system implemented.
|
2016-03-01 23:05:27 +01:00 |
|
 Ayumiwii
|
37aa1eaa18
|
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderQueueFactory.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-18 16:02:43 +01:00 |
|
|
Ayumiwii
|
35269315cc
|
Rename the thingie
|
2016-01-18 13:51:32 +01:00 |
|