 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
|
2ed5fad699
|
The shadows are working
|
2016-02-29 19:17:16 +01:00 |
|
|
FakeShemp
|
20468cba1b
|
Merge branch 'master' into Shadows
# Conflicts:
# assets
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/FrameBuffer.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-02-29 18:03:00 +01:00 |
|
|
FakeShemp
|
8647267cad
|
Make code less dumb, save 7 fps
|
2016-02-27 18:04:33 +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 |
|
 Tleety
|
607e83134d
|
Cubemaps working
|
2016-02-24 14:16:49 +01:00 |
|
|
Tleety
|
6f9ce8a0c1
|
WIP
|
2016-02-24 13:57:54 +01:00 |
|
|
FakeShemp
|
f2ab02d860
|
More WIP
Switching between levels seem to work, but I borked all matrices
|
2016-02-18 22:38:50 +01:00 |
|
|
FakeShemp
|
847c539373
|
Fix viewport
|
2016-02-09 14:44:12 +01:00 |
|
 Ayumiwii
|
cb7f06573f
|
Shadows stage 2 WIP
|
2016-02-09 14:08:57 +01:00 |
|
|
Teejoon
|
d2cfa592f0
|
Supports skinnd and unskinned meshes
ExplosionEffects now supports SplatMapping
|
2016-02-08 13:01:10 +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 |
|
|
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 |
|