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

920 Commits

Author SHA1 Message Date
Jace ccf4cae74b Merge remote-tracking branch 'origin/Animations' 2016-02-11 12:54:42 +01:00
Jace 81943516a9 Protected inheritance, not even once. 2016-02-11 11:36:39 +01:00
viktorljung 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
Jace 0394eacb6b Merge remote-tracking branch 'origin/Animations' into WeaponSystem 2016-02-11 00:18:36 +01:00
William Moberg 73f59b89cc Added method EntityFirstHitByRay, takes an Octree or a vector of sorted entities and outputs the frist entity hit by a ray. 2016-02-11 00:11:37 +01:00
Jace 9d9c6bdf1e Third person animations and shoot effects base work 2016-02-11 00:08:50 +01:00
viktorljung 9c08c351b8 fixed reverse Animation looping 2016-02-10 23:33:23 +01:00
Jocke eb244f87c4 Added disconnect functionality and removed some warnings. 2016-02-10 23:27:46 +01:00
viktorljung dded296cde Animation looping fix 2016-02-10 23:19:44 +01:00
Viktor Ljung c3cc5ae70b Merge pull request #92 from teamfisk/Importer 
Importer
 2016-02-10 22:51:46 +01:00
Teejoon 675a80e905 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-10 22:18:42 +01:00
Jocke ec54b1298d Reconnect is now possible. 2016-02-10 21:02:46 +01:00
Tleety f5de267f25 Merge fixes and CapturePointHUD component skeleton added. 2016-02-10 20:58:10 +01:00
Jace 6396925b68 Merge remote-tracking branch 'origin/Animations' into WeaponSystem 2016-02-10 20:47:33 +01:00
viktorljung 224e95f34a Fixed BoneAttachment component and optimized animation code a bit 2016-02-10 20:45:24 +01:00
Jocke 95fa1f4bbd Connect Fix for TCP Client 2016-02-10 20:10:20 +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
Jace 0825b10c75 Merge remote-tracking branch 'origin/master' into WeaponSystem 
# Conflicts:
#	src/Game/Systems/SoundSystem.cpp
 2016-02-10 19:24:35 +01:00
William Moberg 67cf008122 Bug fixing. 2016-02-10 18:03:58 +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
Jocke 9645169797 Merge remote-tracking branch 'origin/master' into TCPConnections 
# Conflicts:
#	include/Engine/Network/Client.h
#	include/Engine/Network/Network.h
#	include/Engine/Network/Packet.h
#	include/Engine/Network/Server.h
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Packet.cpp
#	src/Engine/Network/Server.cpp
#	src/Tests/HealthSystemTest.cpp
 2016-02-10 17:05:07 +01:00
Jace 2c0f66d9c7 Merge remote-tracking branch 'origin/master' into WeaponSystem 
# Conflicts:
#	include/Engine/Collision/FillFrustumOctreeSystem.h
#	include/Engine/Core/Octree.h
#	include/Engine/Rendering/RenderSystem.h
#	include/Game/Game.h
#	resources/DefaultInput.ini
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Game/Game.cpp
#	src/Game/Systems/PlayerMovementSystem.cpp
 2016-02-10 17:02:00 +01:00
Jocke 4f2ad3ad00 Reliable message should now be working, further testing is to be done. 2016-02-10 16:16:56 +01:00
William Moberg 27cdccac75 Frustrum octree should only get AABBs derived from Model now. 2016-02-10 16:10:41 +01:00
William Moberg b2d35c80f7 Merge branch 'master' into FrustumCulling 
# Conflicts:
#	src/Engine/Collision/Collision.cpp
 2016-02-10 15:08:40 +01:00
Tleety 04c23be136 Merge remote-tracking branch 'origin/master' into Menu 2016-02-10 15:01:51 +01:00
William Moberg f3a76eb13e Explosion effects should get a proper sized AABB. 2016-02-10 15:00:13 +01:00
Jace d931660c56 WIP 2016-02-10 14:43:32 +01:00
viktorljung 61275274f7 Commited this 2016-02-10 14:39:45 +01:00
viktorljung e9d36c48a6 Changed isSkined to IsSkinned and removed duplicated code in PickingPass 2016-02-10 14:36:25 +01:00
viktorljung 08328a781c Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	assets
#	include/Engine/Rendering/Model.h
#	src/Engine/Collision/Collision.cpp
 2016-02-10 14:13:08 +01:00
viktorljung afebf879a0 Merge fixes 2016-02-10 13:44:47 +01:00
Jace 645ee9013a Merge pull request #85 from teamfisk/FrustumCulling 
Frustum culling
 2016-02-10 12:35:24 +01:00
stiffly f6a7b8ea0c Merge remote-tracking branch 'origin/master' into Sound 2016-02-10 11:37:17 +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
Jocke 2ec30fd2b2 Cleaned up code and fixed crash when closing client before server when using udp. 2016-02-10 11:28:03 +01:00
viktorljung 97be22c4a5 Skinned transparent model Picking fixed 2016-02-10 11:22:05 +01:00
stiffly 94ff12cf66 When using a PlaySoundOnEntity Event, you no longer have to provide the child of an entity as parameter. 2016-02-10 11:15:49 +01:00
William Moberg 0bbb627790 Merge branch 'master' into FrustumCulling 2016-02-10 11:04:31 +01:00
viktorljung 2c48c2680f Cleanup 2016-02-10 11:04:28 +01:00
viktorljung 09bb42b3f4 Importer animation fix 2016-02-10 11:00:44 +01:00
William Moberg d65ce805a5 FrustumOctree has its own system, won't cull away explosion effects. 2016-02-10 10:53:25 +01:00
Jace 067780c93f Merge pull request #83 from teamfisk/DefenderShield 
Defender shield
 2016-02-10 10:33:36 +01:00
viktorljung daa96baab5 BoneAttachmentSystem fix for not having a skeleton 2016-02-09 23:03:49 +01:00
viktorljung 001e2441dd Mergefixes 2016-02-09 22:54:51 +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
viktorljung 7212217460 Added animation blending and offset animation component 2016-02-09 22:15:43 +01:00
Jace d83190290f Server now broadcasts certain input commands to all other clients (for stuff like shooting) 2016-02-09 19:37:42 +01:00