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

293 Commits

Author SHA1 Message Date
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
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 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
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
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
William Moberg 86f4ff0b3c Added an annotation for Trigger and Collideable components. 2016-02-10 12:38:36 +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
viktorljung 97be22c4a5 Skinned transparent model Picking fixed 2016-02-10 11:22:05 +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
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 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
Teejoon 060e674a6f Picking supports skinned meshes 2016-02-08 17:37:18 +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 9da1419895 Merge remote-tracking branch 'origin/master' into Sound 2016-02-08 14:24:44 +01:00
Tleety 971beb29d8 Merge remote-tracking branch 'origin/master' into DefenderShield 
# Conflicts:
#	resources/Schema/Components.xsd
 2016-02-08 12:30:41 +01:00
William Moberg 5987751add Merge pull request #81 from teamfisk/HealthPickup 
Health pickup
 2016-02-08 11:50:47 +01:00
Jace 70f8237a16 Merge pull request #60 from teamfisk/3rdPersonDeathCam 
3rd person death cam
 2016-02-08 11:39:57 +01:00
Jace 99cbdd3c1e Player death effect fixes 2016-02-08 11:39:29 +01:00
verysecrethero ce22854168 HealthPickups are now based on a percentage of player maxhealth. You can no longer pickup healthpacks if you are at max health. You can no longer gain more than maxHealth. 2016-02-08 11:22:28 +01:00
Jace 35b0193f15 Merge pull request #72 from teamfisk/BoxModelCollision 
Collision in test phase
 2016-02-08 10:29:41 +01:00
verysecrethero f8e514d21e Merge remote-tracking branch 'origin/master' into HealthPickup 2016-02-08 10:22:35 +01:00
verysecrethero fad25c6e16 Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam 
# Conflicts:
#	include/Engine/Core/EPlayerHealthPickup.h
 2016-02-08 10:21:30 +01:00
Teejoon 43719f8304 Added texture tiling to shaders (exkluding ExplosinEffects) 2016-02-07 15:27:26 +01:00
viktorljung 933a32aa8d Animations kind of working 2016-02-06 18:09:51 +01:00
verysecrethero 4103c878ec Refactoring: Changed HealthPickupSystem to use a struct instead. Removed the Id in EPickupSpawned 2016-02-05 18:05:46 +01:00
verysecrethero be628d9406 Merge remote-tracking branch 'origin/master' into HealthPickup 
# Conflicts:
#	resources/Schema/Components.xsd
 2016-02-05 16:23:22 +01:00
verysecrethero 66f442f1af Added HealthGain to HealthPickup component. Changed PickupSpawnSystem so it copies the values from the old to the new entity. 2016-02-05 16:13:59 +01:00
verysecrethero 2542397511 Miscellaneous small fixes: For Tests, CapturePoint xml file, HealthSystem, DashAbility xml file. 2016-02-05 15:35:51 +01:00
William Moberg 7641ba49c7 Weapon doesn't explode in first person. 2016-02-05 15:16:24 +01:00
verysecrethero fe6fd0bbe3 PickupSpawnSystem now spawns a new HealthPickup after the respawnTimer is up. Added HealthPickup.xml entity. Event PickupSpawned now gets published when a new HealthPickup spawns. Player now gains health as he picks up the HealthPickup. 2016-02-05 15:15:04 +01:00
William Moberg e3a44d37d2 Merge branch 'master' into BoxModelCollision 
# Conflicts:
#	src/Game/Systems/PlayerMovementSystem.cpp
 2016-02-05 14:59:14 +01:00
stiffly e90f802d48 Merge remote-tracking branch 'origin/master' into Sound 2016-02-05 13:59:21 +01:00
William Moberg d61e605093 Can walk up "stair-steps". Cleanup WIP. 
Better performance in RectanglevsTriangle check.
Added IsOnGround flag and VerticalStepHeight in Physics.
Lotsa commented code saved for historical reasons, remove later.
 2016-02-05 10:56:34 +01:00
viktorljung b6e0332574 Fixed support for new animation structure, not done yet 2016-02-05 10:07:22 +01:00
verysecrethero 6a23a987b3 Started PickupSpawnSystem, added 2 events and a system 2016-02-04 17:43:45 +01:00
Tleety 7c582898f4 Working stencil buffer for the shield. 2016-02-04 14:33:39 +01:00
Jace ff26e1235c Merge pull request #77 from teamfisk/AMDCrashFix 
AMD crash fix???????????
 2016-02-04 12:05:05 +01:00
verysecrethero d4292d4b43 Merge pull request #63 from teamfisk/AssaultDash 
Added AssaultDash
 2016-02-04 11:50:00 +01:00
verysecrethero 035c79564b Changed Dash name to DashAbility. Fixed dash bug where you could do two different keys to dash. 2016-02-04 11:41:21 +01:00
viktorljung 6aec7555cc WIP Waiting for importer 2016-02-04 11:13:33 +01:00
Tleety 379d211832 some fixes with the stencil states and implemented stencil func/stencilop/stencilmask to renderstate 2016-02-04 11:13:26 +01:00