Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer

# Conflicts: # include/Engine/Collision/Collision.h # resources/Shaders/ForwardPlus.frag.glsl # resources/Shaders/ForwardPlus.vert.glsl
2016-01-19 18:26:45 +01:00
parent e643581971 dfa96f74e1
commit a47317bb32
119 changed files with 1871 additions and 756 deletions
@@ -24,5 +24,5 @@ void main()

 	Output.Position = Position;
 	Output.TextureCoordinate = TextureCoords;
-	Output.Normal = Normal;
+	Output.Normal = vec3(M * vec4(Normal, 0.0));
 }