This website requires JavaScript.
fb5164221f
HealthHUD redesigned
2016-02-12 01:57:53 +01:00
88c7c57671
Merge remote-tracking branch 'origin/master' into WeaponSystem
Jace
2016-02-12 01:46:45 +01:00
5295133311
Hack to sync ammo over network until we have input replaying + Reload effect from all views
Jace
2016-02-12 01:45:54 +01:00
baff8301b3
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
2016-02-12 01:43:52 +01:00
3e42c067ab
New Map with meshes WIP Update.
2016-02-12 01:43:20 +01:00
3b42f5dbf4
Fixed server so it now deletes.
2016-02-12 01:33:45 +01:00
40ae2b8cbb
DefaultInput key 'K' to kill player, since we can't respawn when alive. Also moved TakeDamage InputCommand to HealthSystem.
2016-02-12 00:52:58 +01:00
f1c2413cf9
Respawning and team picking seems to be working well.
2016-02-12 00:39:27 +01:00
11af6a3078
Merge branch 'master' into Respawning
2016-02-12 00:29:51 +01:00
0370775820
Merge remote-tracking branch 'origin/master' into Menu
2016-02-12 00:28:24 +01:00
a36ed76a4e
AmmunitionHUDSystem now really working
2016-02-12 00:26:59 +01:00
af30e51564
Added AmmoPickupSystem with Component, Entity. Changed so PlayerDeathSystem gets updated after Health/Ammo systems, credits to William.
2016-02-11 23:56:40 +01:00
e24a84c52d
Server now deletes the player on a new player spawn.
2016-02-11 23:52:55 +01:00
04f77da6f1
Merge pull request #101 from teamfisk/Animations
2016-02-11 23:52:44 +01:00
30f454e6a4
Entity fixes
Jace
2016-02-11 23:50:57 +01:00
648d864d6e
Merge remote-tracking branch 'origin/master' into Animations
2016-02-11 23:48:30 +01:00
e473194671
Merge branch 'WeaponSystem'
Jace
2016-02-11 23:46:23 +01:00
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.
Jace
2016-02-11 23:45:30 +01:00
44a73ef883
fixup! Merge remote-tracking branch 'origin/master' into WeaponSystem
Jace
2016-02-11 23:44:20 +01:00
c1860ae383
AmmunitionHUD now working
2016-02-11 23:38:25 +01:00
c4c53944d9
Merge pull request #103 from teamfisk/WeaponSystem
Jace
2016-02-11 23:16:44 +01:00
bdec4f9d16
Merge pull request #100 from teamfisk/Importer
2016-02-11 23:13:10 +01:00
7cae84d4ee
Merge remote-tracking branch 'origin/master' into WeaponSystem
Jace
2016-02-11 22:52:51 +01:00
4964e732ca
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-11 22:51:52 +01:00
1bb1a1445e
Commit assets
2016-02-11 22:51:39 +01:00
d1213f9f59
Working damage dealing, a super cool reload effect and hit markers!
Jace
2016-02-11 22:50:44 +01:00
dd131e7652
Respawning may work, not been tested over network yet.
2016-02-11 22:49:31 +01:00
70f4002d70
Merge remote-tracking branch 'origin/Animations' into TCPConnections
2016-02-11 22:15:59 +01:00
b66e3d3630
WIP trying to hot fix
2016-02-11 22:15:47 +01:00
06f614b3bb
Merge pull request #102 from teamfisk/AssaultDash
2016-02-11 21:46:30 +01:00
4a17e3c8f3
airFriction changed to 2.0 to fix the dash ability in the air
2016-02-11 21:42:29 +01:00
22e35489d7
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-11 21:31:33 +01:00
055f6517a1
Merge remote-tracking branch 'origin/master' into TCPConnections
2016-02-11 21:24:16 +01:00
afd9e24df6
Reverted last commit. Also testing to delay OnPlayerSpawn event for clients. No progress...
2016-02-11 21:23:53 +01:00
851418b1de
Merge remote-tracking branch 'origin/master' into Menu
2016-02-11 21:16:31 +01:00
fee50ba3b6
Crash fix
2016-02-11 21:16:10 +01:00
5bcadd5b1a
Merge pull request #95 from teamfisk/CapturePointTake
2016-02-11 21:10:30 +01:00
42d810b198
Merge pull request #84 from teamfisk/DamageIndicator
2016-02-11 21:08:59 +01:00
3a15550b57
maybe a good commit
2016-02-11 21:07:47 +01:00
8f500965d4
Changed DamageIndicator.xml to not use a glowmap and not a depthsort.
2016-02-11 20:34:25 +01:00
bd385a0d59
new assets
2016-02-11 20:15:56 +01:00
5e05e51309
Fixed EntityFirstHitByRay not returning outDistance properly
Jace
2016-02-11 20:01:23 +01:00
fee1ed6d6d
FIXME: Temporarily removed glow from sprite shader to prevent transparent sprite from occluding other glow
Jace
2016-02-11 20:00:59 +01:00
f79649cf9a
Fixed material file reading bug
2016-02-11 19:38:43 +01:00
2096779eb6
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-11 18:48:21 +01:00
99747c518e
commit assets
2016-02-11 18:48:07 +01:00
f088aa1d85
Commit the files now....
2016-02-11 18:45:48 +01:00
0af337bf39
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-11 18:30:24 +01:00
6caa7e94a4
RGB is now the only channels thats beeing usesed in splatmap
2016-02-11 18:28:33 +01:00
e2a8605101
Merge remote-tracking branch 'origin/master' into WeaponSystem
Jace
2016-02-11 17:25:37 +01:00
c8c4879554
Merge pull request #93 from teamfisk/OctreeRaycasting
Jace
2016-02-11 17:25:02 +01:00
14054ad898
WIP respawning.
2016-02-11 17:08:45 +01:00
e47201ff61
First person shoot animations
Jace
2016-02-11 17:06:34 +01:00
1d14094e90
NewMap Updated. Still WIP
2016-02-11 16:52:10 +01:00
3301f66ad1
Merge remote-tracking branch 'origin/master' into DamageIndicator
2016-02-11 16:36:48 +01:00
49d4a45ef8
Client crashed when connecting, this was a hot fix.
2016-02-11 16:27:33 +01:00
e0c3a32e66
Merge branch 'master' into TCPConnections
2016-02-11 16:26:42 +01:00
97b915f130
Merge branch 'master' into Respawning
2016-02-11 16:15:47 +01:00
c9f815fd42
Merge remote-tracking branch 'origin/master' into CapturePointTake
2016-02-11 16:09:05 +01:00
8eea0c8395
WIP respawning.
2016-02-11 16:08:19 +01:00
38a3e88999
Merge pull request #87 from teamfisk/DoubleJumpEffect
2016-02-11 16:00:09 +01:00
4e23e7bf30
misc changes do the DoubleJumpHexagon.xml
2016-02-11 15:58:58 +01:00
89cbc70177
Merge pull request #99 from teamfisk/Menu
2016-02-11 15:44:17 +01:00
51e0b852d2
Adamfix
2016-02-11 15:43:41 +01:00
7ccaf5b040
Removed commeted code
2016-02-11 15:42:27 +01:00
66e20c3fd9
Merge remote-tracking branch 'origin/master' into Menu
2016-02-11 15:38:18 +01:00
6ba1e95da7
Fixed depth sorting for HUD elements.
2016-02-11 15:27:07 +01:00
a8ab49f202
Merge remote-tracking branch 'origin/master' into DoubleJumpEffect
2016-02-11 15:19:01 +01:00
bef50ef96a
Merge pull request #97 from teamfisk/Menu
2016-02-11 15:13:12 +01:00
9f657ada4e
merge fixes
2016-02-11 14:52:52 +01:00
f0ae365401
Merge remote-tracking branch 'origin/master' into Menu
2016-02-11 14:43:30 +01:00
7d4a4ed7cf
Merge remote-tracking branch 'origin/master' into Animations
2016-02-11 14:38:23 +01:00
bbbab7b287
Merge pull request #96 from teamfisk/WeaponSystem
2016-02-11 14:26:17 +01:00
fa2e556ab2
fixed some error handling in TCPClient.
2016-02-11 14:07:51 +01:00
97de31be65
Fixed BoneAttachment component
2016-02-11 13:36:27 +01:00
95289f47d6
Merge branch 'master' into WeaponSystem
Jace
2016-02-11 12:58:09 +01:00
ccf4cae74b
Merge remote-tracking branch 'origin/Animations'
Jace
2016-02-11 12:54:42 +01:00
2f640d224c
New Map with Meshes WIP
2016-02-11 12:23:20 +01:00
f11bd24d53
Added CapturePointMaxTimer in CapturePointComponent. Removed next-capturepoint Color. Modified captureTimer to +-captureTimeToTakeOver after a capture.
2016-02-11 11:46:34 +01:00
81943516a9
Protected inheritance, not even once.
Jace
2016-02-11 11:36:39 +01:00
e350074cb5
Spawner now spawns with orientation
Jace
2016-02-11 11:36:15 +01:00
350effd8eb
New assets and some QA map stuff
2016-02-11 11:32:51 +01:00
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
ecc473d520
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-11 10:30:40 +01:00
35e4935497
Some assets and HUD stuff
2016-02-11 10:01:11 +01:00
0394eacb6b
Merge remote-tracking branch 'origin/Animations' into WeaponSystem
Jace
2016-02-11 00:12:02 +01:00
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
9d9c6bdf1e
Third person animations and shoot effects base work
Jace
2016-02-11 00:08:50 +01:00
92e7d3ecf7
Merge remote-tracking branch 'origin/master' into Importer
2016-02-11 00:08:17 +01:00
4b8f4981a3
New Map with Meshes, WIP.
2016-02-11 00:05:27 +01:00
447f41dbff
HUD for capture points now update with Capture point data.
2016-02-10 23:59:13 +01:00
9c08c351b8
fixed reverse Animation looping
2016-02-10 23:33:23 +01:00
eb244f87c4
Added disconnect functionality and removed some warnings.
2016-02-10 23:27:46 +01:00
dded296cde
Animation looping fix
2016-02-10 23:19:44 +01:00
c3cc5ae70b
Merge pull request #92 from teamfisk/Importer
2016-02-10 22:51:46 +01:00
64a2354b24
WIP with CapturePointHUDSystem
2016-02-10 22:22:09 +01:00
675a80e905
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-10 22:18:42 +01:00
f05d0a1b0c
assets
2016-02-10 22:18:27 +01:00
ec54b1298d
Reconnect is now possible.
2016-02-10 21:02:46 +01:00
f5de267f25
Merge fixes and CapturePointHUD component skeleton added.
2016-02-10 20:58:10 +01:00
viktorljung
Jace
antc13
Jocke
William Moberg
verysecrethero
stiffly
Viktor Ljung
Tobias Dahl
Teejoon