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

758 Commits

Author SHA1 Message Date
viktorljung af034673f6 BoneAttachments now working and BlendTrees are created in the AnimationSystem 2016-02-26 10:17:47 +01:00
viktorljung c97d0d9381 Fixed memory leaks and cleaned up Skeleton and BlendTree 2016-02-25 11:30:09 +01:00
viktorljung 606a9bf94f BlendTree now working but has some memory leaks 2016-02-23 17:06:41 +01:00
viktorljung 127edb4e60 Fixed some memory leaks 2016-02-22 17:47:30 +01:00
viktorljung abd36c81f8 Added BlendTree that stores and blends multiple animations 2016-02-22 15:58:38 +01:00
viktorljung 3c9c95cff4 Animation blending improved and Animation Override added 2016-02-18 16:34:18 +01:00
viktorljung debb1881bf BoneAttachment working 2016-02-17 15:48:45 +01:00
viktorljung db8bc612bd AdditiveBlend now working, needs cleanup 2016-02-17 14:55:02 +01:00
viktorljung e7118ce8e5 WIP 2016-02-17 10:52:50 +01:00
viktorljung 648d864d6e Merge remote-tracking branch 'origin/master' into Animations 2016-02-11 23:48:30 +01:00
Jace b761439c84 Added config flag Debug.OutOfBodyExperience that allows you to spawn and view a player from a third person perspective, without the active camera being changed. 2016-02-11 23:45:30 +01:00
Jace 44a73ef883 fixup! Merge remote-tracking branch 'origin/master' into WeaponSystem 2016-02-11 23:44:20 +01:00
Jace 7cae84d4ee Merge remote-tracking branch 'origin/master' into WeaponSystem 
# Conflicts:
#	include/Engine/Core/EPlayerDamage.h
#	src/Game/Game.cpp
#	src/Game/Systems/Weapon/WeaponSystem.cpp
 2016-02-11 22:52:51 +01:00
Jace d1213f9f59 Working damage dealing, a super cool reload effect and hit markers! 2016-02-11 22:50:44 +01:00
Tobias Dahl 5bcadd5b1a Merge pull request #95 from teamfisk/CapturePointTake 
Fixed CapturePointTimer,Color
 2016-02-11 21:10:30 +01:00
Tobias Dahl 42d810b198 Merge pull request #84 from teamfisk/DamageIndicator 
Damage indicator
 2016-02-11 21:08:59 +01:00
verysecrethero 8f500965d4 Changed DamageIndicator.xml to not use a glowmap and not a depthsort. 2016-02-11 20:34:25 +01:00
Jace 5e05e51309 Fixed EntityFirstHitByRay not returning outDistance properly 2016-02-11 20:01:23 +01:00
Jace e2a8605101 Merge remote-tracking branch 'origin/master' into WeaponSystem 2016-02-11 17:25:37 +01:00
Jace c8c4879554 Merge pull request #93 from teamfisk/OctreeRaycasting 
Entity in octree hit by ray
 2016-02-11 17:25:02 +01:00
Jace e47201ff61 First person shoot animations 2016-02-11 17:06:34 +01:00
verysecrethero 3301f66ad1 Merge remote-tracking branch 'origin/master' into DamageIndicator 
# Conflicts:
#	resources/Shaders/Sprite.vert.glsl
 2016-02-11 16:36:48 +01:00
verysecrethero c9f815fd42 Merge remote-tracking branch 'origin/master' into CapturePointTake 
# Conflicts:
#	src/Game/Systems/CapturePointSystem.cpp
 2016-02-11 16:09:05 +01:00
verysecrethero 38a3e88999 Merge pull request #87 from teamfisk/DoubleJumpEffect 
Spawned DoubleJumpHexagon  as the player doublejumps
 2016-02-11 16:00:09 +01:00
Tleety 6ba1e95da7 Fixed depth sorting for HUD elements. 2016-02-11 15:27:07 +01:00
verysecrethero a8ab49f202 Merge remote-tracking branch 'origin/master' into DoubleJumpEffect 
# Conflicts:
#	include/Game/Systems/PlayerMovementSystem.h
 2016-02-11 15:19:01 +01:00
Tleety 9f657ada4e merge fixes 2016-02-11 14:52:52 +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
viktorljung 7d4a4ed7cf Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	src/Engine/Rendering/Skeleton.cpp
 2016-02-11 14:38:23 +01:00
viktorljung 97de31be65 Fixed BoneAttachment component 2016-02-11 13:36:27 +01:00
verysecrethero f11bd24d53 Added CapturePointMaxTimer in CapturePointComponent. Removed next-capturepoint Color. Modified captureTimer to +-captureTimeToTakeOver after a capture. 2016-02-11 11:46:34 +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
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
Tleety 447f41dbff HUD for capture points now update with Capture point data. 2016-02-10 23:59:13 +01:00
Tleety 64a2354b24 WIP with CapturePointHUDSystem 2016-02-10 22:22:09 +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
verysecrethero a53ab7f745 A few fixes for DashAbility. Default DoubleTapToDash is now set to false. 2016-02-10 20:46:16 +01:00
viktorljung 224e95f34a Fixed BoneAttachment component and optimized animation code a bit 2016-02-10 20:45:24 +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
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
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