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

1138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Teejoon 99747c518e commit assets 2016-02-11 18:48:07 +01:00
Teejoon f088aa1d85 Commit the files now.... 2016-02-11 18:45:48 +01:00
Teejoon 0af337bf39 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-11 18:30:24 +01:00
Teejoon 6caa7e94a4 RGB is now the only channels thats beeing usesed in splatmap 2016-02-11 18:28:33 +01:00
antc13 1d14094e90 NewMap Updated. Still WIP 2016-02-11 16:52:10 +01:00
antc13 2f640d224c New Map with Meshes WIP 2016-02-11 12:23:20 +01:00
Teejoon ecc473d520 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-11 10:30:40 +01:00
antc13 92e7d3ecf7 Merge remote-tracking branch 'origin/master' into Importer 
# Conflicts:
#	assets
 2016-02-11 00:08:17 +01:00
antc13 4b8f4981a3 New Map with Meshes, WIP. 2016-02-11 00:05:27 +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
Teejoon f05d0a1b0c assets 2016-02-10 22:18:27 +01:00
Jace ed06eacf6f Merge pull request #91 from teamfisk/Sound 
Sound fix
 2016-02-10 19:16:45 +01:00
Jace 3c3149b13e Merge pull request #90 from teamfisk/FrustumCulling 
Correct bounding box for explosion effects
 2016-02-10 19:16:36 +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
Teejoon b0bdca5cdd SplatMap räknas rätt ny och mitmaps i Texture.cpp 2016-02-10 17:15:08 +01:00
William Moberg 27cdccac75 Frustrum octree should only get AABBs derived from Model now. 2016-02-10 16:10:41 +01:00
antc13 646806b50e New Map with meshes WIP 2016-02-10 15:40:59 +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 1e238b2407 Changed asset branch 2016-02-10 14:28:25 +01:00
verysecrethero 1ebe174b94 Merge pull request #88 from teamfisk/Sound 
Sound
 2016-02-10 14:14:47 +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
William Moberg 86f4ff0b3c Added an annotation for Trigger and Collideable components. 2016-02-10 12:38:36 +01:00
Jace 645ee9013a Merge pull request #85 from teamfisk/FrustumCulling 
Frustum culling
 2016-02-10 12:35:24 +01:00
Jace 4a5ab048bd Merge pull request #86 from teamfisk/Sound 
Sound
 2016-02-10 12:33:01 +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 3c22dcc165 changed assetbranch 2016-02-09 22:34:09 +01:00