BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,902 Commits 116 Branches 0 Tags
BoxModelCollision
Commit Graph

174 Commits

Author SHA1 Message Date
Tleety 97fcdb342d Bloom should now show behind transparent objects. 2016-02-19 14:23:40 +01:00
Tleety 949ee76f55 Fallow and name fix 2016-02-19 13:52:16 +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 bf376f54b6 WIP 
I think this is now finding the different segments of the cascade
 2016-02-18 20:48:39 +01:00
FakeShemp 178402e964 cascade shadow wip 2016-02-18 10:08:29 +01:00
Tleety 6bc7131290 Glow Intencity can now be changed in the model component. 2016-02-16 14:57:21 +01:00
Jace c4c53944d9 Merge pull request #103 from teamfisk/WeaponSystem 
Working weapon system
 2016-02-11 23:16:44 +01:00
Jace fee1ed6d6d FIXME: Temporarily removed glow from sprite shader to prevent transparent sprite from occluding other glow 2016-02-11 20:00:59 +01:00
Teejoon 2096779eb6 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-11 18:48:21 +01:00
Teejoon f088aa1d85 Commit the files now.... 2016-02-11 18:45:48 +01:00
Tleety 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
Tleety 447f41dbff HUD for capture points now update with Capture point data. 2016-02-10 23:59:13 +01:00
FakeShemp 36043010af wip for shadows 
they work, but will be shit until we get cascaded.
 2016-02-10 20:51:33 +01:00
Tleety 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
Tleety 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
Teejoon fa781d5c88 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-10 17:16:14 +01:00
Teejoon 97780395cf ... Now mipmaps and Splatmaps i comming :) 2016-02-10 17:15:54 +01:00
FakeShemp cb77c1ff97 Working pcf, not optimized 2016-02-10 16:16:41 +01:00
FakeShemp 69db32337d Shado wip 2016-02-10 15:16:58 +01:00
viktorljung afebf879a0 Merge fixes 2016-02-10 13:44:47 +01:00
Ayumiwii 6af167675d Shadow WIP stage 2 
- fix cel-shading
 2016-02-10 11:48:44 +01:00
viktorljung 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
viktorljung 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
Ayumiwii ecd823cb9f Shadow WIP stage 2 
-  Soft shadow
 2016-02-09 16:15:11 +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 060e674a6f Picking supports skinned meshes 2016-02-08 17:37:18 +01:00
Teejoon d2cfa592f0 Supports skinnd and unskinned meshes 
ExplosionEffects now supports SplatMapping
 2016-02-08 13:01:10 +01:00
Tleety 94b59af973 Defender shield should now be working 2016-02-08 11:47:35 +01:00
Teejoon 43719f8304 Added texture tiling to shaders (exkluding ExplosinEffects) 2016-02-07 15:27:26 +01:00
Teejoon 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
viktorljung 933a32aa8d Animations kind of working 2016-02-06 18:09:51 +01:00
Ayumiwii 6542d1b444 Shadow WIP 
- DepthTexture working
 2016-02-05 17:29:53 +01:00
viktorljung 8034b42c87 spriteComponent WIP 2016-02-05 16:43:57 +01:00
Ayumiwii bbf6058c17 Shadow WIP 
- fixed file placing of ShadowPass.cpp
 2016-02-05 16:13:46 +01:00
Ayumiwii 0e51ae7dc9 shadow wip 2016-02-05 15:31:20 +01:00
Ayumiwii 7f1016476b Shadows WIP 
- create 2D texture (depthmap)
 2016-02-05 15:08:56 +01:00
Tleety 7c582898f4 Working stencil buffer for the shield. 2016-02-04 14:33:39 +01:00
Tleety 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 192de80782, reversing
changes made to 24aac6a00d.
 2016-02-03 16:16:06 +01:00
Tleety 12a181c1ff Fixed a bug where normals scaled with model scale. Again. 2016-02-02 16:11:03 +01:00
Tleety 9c2e459e0c Deatheffect color now correctly calculated 2016-02-02 10:58:00 +01:00
Tleety ed7d00c1d8 Bug where widgets did not get their ambient light now fixed. 2016-02-01 18:19:38 +01:00
Tleety 53cae25eb2 WIP on widget fuckery 2016-02-01 16:56:55 +01:00
Tleety 7054822be2 SceneLight component now working 2016-02-01 11:12:03 +01:00
Tleety 97cbc55223 Some debug features for color corrections and glow strength fix. 2016-01-27 17:21:00 +01:00
Tleety a63ecb8133 Some wierd shader faults and merge error fixe 2016-01-27 15:54:36 +01:00
Tleety 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
Tleety 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