c09c2f4783
Merge remote-tracking branch 'origin/Importer' into Animations
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/RenderingWorld.xml
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Skeleton.cpp
2016-02-09 22:50:19 +01:00
7212217460
Added animation blending and offset animation component
2016-02-09 22:15:43 +01:00
060e674a6f
Picking supports skinned meshes
2016-02-08 17:37:18 +01:00
d2cfa592f0
Supports skinnd and unskinned meshes
...
ExplosionEffects now supports SplatMapping
2016-02-08 13:01:10 +01:00
43719f8304
Added texture tiling to shaders (exkluding ExplosinEffects)
2016-02-07 15:27:26 +01:00
92ab22e779
Splatmapping now working.
...
Rendering pipleline now support 3 different types of Material:
Basic: a material with a single color on every property (diffuse, specular, ect).
SingleTextures: a material with a single texture in all or any property. Have a single color on the rest.
SplatMapping: has a SplatMap and 0 to 5 different textures to every property. Properties with o texture uses a single color insted.
All materials with a texture has a UVRepeat, telling how many time to till in U and in V.
modelJobs now uses ShadeID, ModelID and TextureID for the Hash insted of only Texture
MayaExported exports 3 differnt types of material, the same as the piplen now supports.
2016-02-07 13:39:13 +01:00
933a32aa8d
Animations kind of working
2016-02-06 18:09:51 +01:00
ceab837e27
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
...
Conflicts:
include/Engine/Rendering/RawModelCustom.h
src/Engine/Rendering/RawModelCustom.cpp
src/Engine/Rendering/Skeleton.cpp
2016-02-05 13:59:01 +01:00
d1a309be10
Now supports reading of 3 different types of materials
2016-02-05 13:51:47 +01:00
b6e0332574
Fixed support for new animation structure, not done yet
2016-02-05 10:07:22 +01:00
c272857819
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
...
Conflicts:
src/Engine/Rendering/RawModelCustom.cpp
tools/MayaExporter/MayaExporter/Skeleton.cpp
2016-02-04 15:05:00 +01:00
336b058c9f
WIP, commit to be able to pull stuff down
2016-02-04 14:58:46 +01:00
35376178b1
WIP
2016-02-04 11:54:13 +01:00
2733efdc0d
Merge remote-tracking branch 'origin/Importer' into Animations
...
# Conflicts:
# include/Engine/Rendering/Skeleton.h
# src/Engine/Rendering/RawModelCustom.cpp
# src/Engine/Rendering/Skeleton.cpp
2016-02-04 11:32:44 +01:00
356cf72b0f
Changed the structure of the Animation Data in both Exporter & Importer.
2016-02-04 11:25:31 +01:00
6aec7555cc
WIP Waiting for importer
2016-02-04 11:13:33 +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 192de8078224aac6a00d
2016-02-03 16:16:06 +01:00
4357759715
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-02 17:18:54 +01:00
bb4a65a1db
Non-skined mesh WIP
2016-02-02 17:18:42 +01:00
89bc063ef0
Merge remote-tracking branch 'origin/Importer' into Animations
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
2016-02-02 15:01:34 +01:00
dba2fbdc0c
WIP
2016-02-02 14:52:31 +01:00
e8186a7062
Changed the way we're exporting animations.
2016-02-02 14:47:22 +01:00
7b4826cb44
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-02 13:24:31 +01:00
c708f1582c
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-01 18:30:30 +01:00
Jace
a3d4eb65d5
Fixes #66 warnings
2016-02-01 17:53:01 +01:00
53cae25eb2
WIP on widget fuckery
2016-02-01 16:56:55 +01:00
Jace
be3cfef65f
Merge remote-tracking branch 'origin/master' into EditorUsefulness
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
2016-02-01 16:00:46 +01:00
Jace
a22bc00d46
*cough*
2016-02-01 13:37:51 +01:00
7054822be2
SceneLight component now working
2016-02-01 11:12:03 +01:00
6ba87d2942
Fixed, Crash when trying to animate a model that doesn't contain animations
2016-02-01 10:42:23 +01:00
51075aefc8
Model that has animations is now visible when it does not play an animation (T-pose)
2016-02-01 10:24:50 +01:00
8bcafc1151
WIP
2016-01-27 18:07:05 +01:00
2ec5023752
Changed Animation and BoneAttachment "Name" field to "AnimationName" and "BoneName"
2016-01-27 17:27:34 +01:00
97cbc55223
Some debug features for color corrections and glow strength fix.
2016-01-27 17:21:00 +01:00
405002777c
Merge remote-tracking branch 'origin/EditorUsefulness' into Animations
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/FastWorld.xml
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Game.cpp
2016-01-27 17:16:49 +01:00
8fc8d56ee1
Added BoneAttachment component
2016-01-27 17:14:16 +01:00
0e70dc6fa3
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 15:41:31 +01:00
44302bb0f3
Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component
2016-01-27 15:38:54 +01:00
a954cbbf50
Normal map support
2016-01-27 13:52:27 +01:00
Jace
dec2234019
Merge branch 'Cleanup'
...
# Conflicts:
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 13:44:15 +01:00
Jace
0334ec3fa7
Merge remote-tracking branch 'origin/Animations'
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Systems/WeaponSystem.cpp
2016-01-27 13:36:49 +01:00
8102f3a2ea
Working transparency in most common cases.
...
Transparency check is automatically set if the alpha color value is under 1
2016-01-27 12:59:44 +01:00
cbb17d22d4
WIP
2016-01-27 12:10:00 +01:00
Jace
8bed5194d8
"Proper" handling of conditional rendering of entities parented to camera or entities that should be hidden from the active local player perspective
2016-01-27 11:36:24 +01:00
Jace
7e12d00874
Merge branch 'master' into CoolDeathAnimation
...
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 10:43:23 +01:00
d12246833e
Some further small fizes to resolution //Tobias
2016-01-25 01:26:41 +01:00
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
Jace
b95c1fdfa4
Merge remote-tracking branch 'origin/Menu'
...
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/RenderingWorld.xml
# src/Game/Game.cpp
2016-01-25 00:25:03 +01:00
6aeb281249
Resolution fix in render stages //Tobias
2016-01-25 00:07:17 +01:00
viktorljung
Teejoon
antc13
Jace
Tleety
stiffly