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

923 Commits

Author SHA1 Message Date
Viktor Ljung c3cc5ae70b Merge pull request #92 from teamfisk/Importer 
Importer
 2016-02-10 22:51:46 +01:00
Jace ed06eacf6f Merge pull request #91 from teamfisk/Sound 
Sound fix
 2016-02-10 19:16:45 +01:00
William Moberg 67cf008122 Bug fixing. 2016-02-10 18:03:58 +01:00
stiffly 8520192805 Merge remote-tracking branch 'origin/master' into Sound 2016-02-10 17:17:58 +01:00
stiffly 1ba9d97ab7 Fixed crash when trying to jump, when no player is spawned. 2016-02-10 17:17:41 +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
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
William Moberg f3a76eb13e Explosion effects should get a proper sized AABB. 2016-02-10 15:00:13 +01:00
Jace 019e85a425 Merge pull request #89 from teamfisk/Animations 
Animations
 2016-02-10 14:40:23 +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
stiffly c2128790af Now using appropriate variable to see if a player is on ground. Does not check if playervel.y == 0 which will be false if a player is on a obstacle. 2016-02-10 14:07:11 +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
stiffly 3d2f9fa79d Drum sounds does not start every single time a TriggerTouch happens. Specific and temporary logic for play test. 2016-02-10 11:36:54 +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 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
Jace 90192e016a Merge pull request #82 from teamfisk/BoxModelCollision 
Small fixes to collision/trigger-boxes, etc.
 2016-02-10 10:08:54 +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
William Moberg ecfacee587 Undo debug test code. 2016-02-09 19:33:28 +01:00
William Moberg a93ccecfeb Debug test code. 2016-02-09 19:23:12 +01:00
William Moberg 7140b740b5 Models/Collideables/etc. won't need a AABB component anymore, if it has a Model component. In addition, they should take rotation into account, i.e it doesn't have to be axis-aligned. 2016-02-09 19:20:04 +01:00
William Moberg 830e0f66c9 Tiny: Changed warning message. 2016-02-09 17:21:10 +01:00
William Moberg eec59a40c8 Nitpicks. 2016-02-09 17:19:39 +01:00
William Moberg 239a8e7a6a Frustum culling should be working. 2016-02-09 17:12:23 +01:00
William Moberg 232bf66a09 Jump height is constant for the double jump. 2016-02-09 16:09:08 +01:00
William Moberg b9d6d59c62 Merge branch 'BoxModelCollision' into FrustumCulling 
# Conflicts:
#	src/Game/Game.cpp
 2016-02-09 15:03:13 +01:00
William Moberg b30891aecd WIP, debugging code added, still not working. 2016-02-09 15:00:30 +01:00
William Moberg b748deb1e1 WIP FrustumCulling, most code added but not working now. 2016-02-09 10:05:49 +01:00
Teejoon 060e674a6f Picking supports skinned meshes 2016-02-08 17:37:18 +01:00
stiffly 2c64ffc3d1 No longer using a variable to see if we're in editor mode. 2016-02-08 16:52:35 +01:00
stiffly aa5878d6df Used config for soundsystem properties. 2016-02-08 16:40:13 +01:00
stiffly 7752832ce5 No longer needs this walk logic in SoundSystem 2016-02-08 16:21:49 +01:00
stiffly 6f163bf3a3 Fixed bug where it crashed on respawn. Also bug where i subscribed to an event twice. 2016-02-08 16:13:09 +01:00
Tleety 9055d5f697 Bugfix 2016-02-08 15:22:28 +01:00
William Moberg 93c6f3c0a3 AABBs are auto attached when adding Trigger/Collideable/etc, also added AttachComponent method to ComponentWrapper. 2016-02-08 14:34:37 +01:00
stiffly 14c5410524 Merge fix 2016-02-08 14:29:55 +01:00