 Tleety
|
a954cbbf50
|
Normal map support
|
2016-01-27 13:52:27 +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 |
|
 antc13
|
b5b1140f5c
|
Custom Animations should now work. We also save color values if there's no texture.
|
2016-01-24 13:28:40 +01:00 |
|
|
antc13
|
3baa988ad4
|
Changed .obj files to our own format. DummyScene.mesh may be broken.
|
2016-01-23 20:35:58 +01:00 |
|
|
antc13
|
f1835fd89c
|
Animations PROBABLY works fine if all joints got keyframes.
|
2016-01-23 18:02:42 +01:00 |
|
|
antc13
|
a47317bb32
|
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 |
|
|
Tleety
|
982837052a
|
DirectionalLight now correctly getting directions
|
2016-01-19 14:44:17 +01:00 |
|
 Ayumiwii
|
77e1dacb6f
|
Merge
|
2016-01-19 09:58:52 +01:00 |
|
|
antc13
|
2a3009212a
|
Importing custom mesh without material.
|
2016-01-18 19:37:55 +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
|
1e370bac13
|
ForwardPlus base debug commit.
|
2015-12-15 15:28:37 +01:00 |
|