cf2bf4e14d
Merge remote-tracking branch 'origin/master' into ResolutionChange
2016-02-19 13:17:31 +01:00
fc5d054cb2
Entity is now sent with the click events.
...
Fixed small things
2016-02-19 12:49:07 +01:00
8c9f4bb84b
Resize should now be working correctly.
2016-02-19 11:42:52 +01:00
e15a7b9485
You can now change resolution without any apparent bugs.
2016-02-18 18:00:26 +01:00
8f84a5ddd6
Buttons are now clickable
2016-02-16 16:28:19 +01:00
6bc7131290
Glow Intencity can now be changed in the model component.
2016-02-16 14:57:21 +01:00
648d864d6e
Merge remote-tracking branch 'origin/master' into Animations
2016-02-11 23:48:30 +01:00
2096779eb6
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-11 18:48:21 +01:00
f088aa1d85
Commit the files now....
2016-02-11 18:45:48 +01:00
51e0b852d2
Adamfix
2016-02-11 15:43:41 +01:00
6ba1e95da7
Fixed depth sorting for HUD elements.
2016-02-11 15:27:07 +01:00
9f657ada4e
merge fixes
2016-02-11 14:52:52 +01:00
f0ae365401
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# src/Engine/Rendering/Texture.cpp
# src/Game/Game.cpp
2016-02-11 14:43:30 +01:00
607150189c
Different animations can now be played on multiple meshes, AnimationOffset seems to make the lighting buggy
2016-02-11 10:51:11 +01:00
f5de267f25
Merge fixes and CapturePointHUD component skeleton added.
2016-02-10 20:58:10 +01:00
224e95f34a
Fixed BoneAttachment component and optimized animation code a bit
2016-02-10 20:45:24 +01:00
2cae4e3fb2
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/RenderQueue.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/QualityAssurance.xml
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/Sprite.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/Model.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-02-10 19:52:42 +01:00
53265bbc90
PNG is now a resource.
...
You can now load textures threaded.
PNG will now throw exceptions when errors happend
SpriteComponent is now working without billboarding.
2016-02-10 17:50:17 +01:00
e9d36c48a6
Changed isSkined to IsSkinned and removed duplicated code in PickingPass
2016-02-10 14:36:25 +01:00
afebf879a0
Merge fixes
2016-02-10 13:44:47 +01:00
49e6252ee1
Merge remote-tracking branch 'origin/master' into Animations
...
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CollisionTestLevel.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Collision/Collision.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-02-10 11:33:45 +01:00
09bb42b3f4
Importer animation fix
2016-02-10 11:00:44 +01:00
001e2441dd
Mergefixes
2016-02-09 22:54:51 +01:00
9055d5f697
Bugfix
2016-02-08 15:22:28 +01:00
d2cfa592f0
Supports skinnd and unskinned meshes
...
ExplosionEffects now supports SplatMapping
2016-02-08 13:01:10 +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
8034b42c87
spriteComponent WIP
2016-02-05 16:43:57 +01:00
c526a7af55
WIP stencil stuff
2016-02-04 17:58:36 +01:00
7c582898f4
Working stencil buffer for the shield.
2016-02-04 14:33:39 +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
7ffbd8455f
Added Queues for the models with shield and shielded components.
2016-02-03 13:53:57 +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
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
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
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
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
Tleety
viktorljung
Teejoon
Jace