 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
|
7ea26d10ee
|
Rewritten. Works as a charm now.
|
2016-03-03 03:28:21 +01:00 |
|
|
FakeShemp
|
70374fa10e
|
It compiles, but no shadows
|
2016-02-29 18:20:32 +01:00 |
|
 viktorljung
|
afebf879a0
|
Merge fixes
|
2016-02-10 13:44:47 +01:00 |
|
|
Teejoon
|
060e674a6f
|
Picking supports skinned meshes
|
2016-02-08 17:37:18 +01:00 |
|
|
Teejoon
|
d2cfa592f0
|
Supports skinnd and unskinned meshes
ExplosionEffects now supports SplatMapping
|
2016-02-08 13:01:10 +01:00 |
|