2ee21e05d4
Fixed so that Shielded objects can be picked. Shield objects can not however, so they will not be able to be picked in editor either.
2016-02-08 12:29:41 +01:00
94b59af973
Defender shield should now be working
2016-02-08 11:47:35 +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
6542d1b444
Shadow WIP
...
- DepthTexture working
2016-02-05 17:29:53 +01:00
8034b42c87
spriteComponent WIP
2016-02-05 16:43:57 +01:00
bbf6058c17
Shadow WIP
...
- fixed file placing of ShadowPass.cpp
2016-02-05 16:13:46 +01:00
7f1016476b
Shadows WIP
...
- create 2D texture (depthmap)
2016-02-05 15:08:56 +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
c526a7af55
WIP stencil stuff
2016-02-04 17:58:36 +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
7c582898f4
Working stencil buffer for the shield.
2016-02-04 14:33:39 +01:00
571c41589a
Merge remote-tracking branch 'origin/Importer' into Animations
2016-02-04 11:54:20 +01:00
35376178b1
WIP
2016-02-04 11:54:13 +01:00
Jace
6990e473b3
Adding a clear here makes AMD drivers NOT crash for some reason. We're fixing the symptom but not the underlying cause.
2016-02-04 11:53:35 +01:00
84499665d0
Changed vertices to skinnedVertices in RawModelCustom.cpp
2016-02-04 11:53:17 +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
379d211832
some fixes with the stencil states and implemented stencil func/stencilop/stencilmask to renderstate
2016-02-04 11:13:26 +01:00
bc01e147c2
Some state stuff, some draw stuff, some QA map stuff
2016-02-03 18:09:44 +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
5665c0f298
Models with Shield and shielded component now added to queues
2016-02-03 14:20:47 +01:00
7ffbd8455f
Added Queues for the models with shield and shielded components.
2016-02-03 13:53:57 +01:00
73716c28e2
pickpass fix
2016-02-02 17:40:22 +01:00
a3b7bd7df5
Fix in picking pass, QA map fix. Blue and red ray change. Player weapon change.
2016-02-02 17:39:57 +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
b131f56f5e
Made a quality assurance world that will need to be used before creating a pull request
2016-02-02 16:06: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
8299b99e2f
Test world changes and some other small fixes
2016-02-01 19:08:46 +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
Tleety
Teejoon
viktorljung
Ayumiwii
Jace
antc13