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

1225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 e473194671 Merge branch 'WeaponSystem' 2016-02-11 23:46:23 +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 c4c53944d9 Merge pull request #103 from teamfisk/WeaponSystem 
Working weapon system
 2016-02-11 23:16:44 +01:00
Tobias Dahl bdec4f9d16 Merge pull request #100 from teamfisk/Importer 
Splatmap only using RGB channel and an importer bug fix
 2016-02-11 23:13:10 +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
Teejoon 4964e732ca Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-11 22:51:52 +01:00
Teejoon 1bb1a1445e Commit assets 2016-02-11 22:51:39 +01:00
Jace d1213f9f59 Working damage dealing, a super cool reload effect and hit markers! 2016-02-11 22:50:44 +01:00
William Moberg 06f614b3bb Merge pull request #102 from teamfisk/AssaultDash 
AirFriction changed to 2.0 to fix the dash ability in the air
 2016-02-11 21:46:30 +01:00
verysecrethero 4a17e3c8f3 airFriction changed to 2.0 to fix the dash ability in the air 2016-02-11 21:42:29 +01:00
verysecrethero 22e35489d7 Merge remote-tracking branch 'origin/master' into AssaultDash 2016-02-11 21:31:33 +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 3a15550b57 maybe a good commit 2016-02-11 21:07:47 +01:00
verysecrethero 8f500965d4 Changed DamageIndicator.xml to not use a glowmap and not a depthsort. 2016-02-11 20:34:25 +01:00
viktorljung bd385a0d59 new assets 2016-02-11 20:15:56 +01:00
Jace 5e05e51309 Fixed EntityFirstHitByRay not returning outDistance properly 2016-02-11 20:01:23 +01:00
Jace fee1ed6d6d FIXME: Temporarily removed glow from sprite shader to prevent transparent sprite from occluding other glow 2016-02-11 20:00:59 +01:00
Teejoon f79649cf9a Fixed material file reading bug 2016-02-11 19:38:43 +01:00
Teejoon 2096779eb6 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer 2016-02-11 18:48:21 +01:00
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
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
antc13 1d14094e90 NewMap Updated. Still WIP 2016-02-11 16:52:10 +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
verysecrethero 4e23e7bf30 misc changes do the DoubleJumpHexagon.xml 2016-02-11 15:58:58 +01:00
Adam Byléhn 89cbc70177 Merge pull request #99 from teamfisk/Menu 
Menu
 2016-02-11 15:44:17 +01:00
Tleety 51e0b852d2 Adamfix 2016-02-11 15:43:41 +01:00
Tleety 7ccaf5b040 Removed commeted code 2016-02-11 15:42:27 +01:00
Tleety 66e20c3fd9 Merge remote-tracking branch 'origin/master' into Menu 2016-02-11 15:38:18 +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
Adam Byléhn bef50ef96a Merge pull request #97 from teamfisk/Menu 
Menu
 2016-02-11 15:13:12 +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
Joachim Pettersson bbbab7b287 Merge pull request #96 from teamfisk/WeaponSystem 
Network improvements and base weapon work
 2016-02-11 14:26:17 +01:00
viktorljung 97de31be65 Fixed BoneAttachment component 2016-02-11 13:36:27 +01:00