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

1423 Commits

Author SHA1 Message Date
Jace 36477abc63 WTF? 2016-03-08 18:26:03 +01:00
Jace ecc8d998cf Added ComponentInfo::Field_t::Index 2016-03-08 15:46:14 +01:00
William Moberg 3436ba6656 Merge pull request #177 from teamfisk/AmmoPickup 
Fixed some systems added twice in Game.cpp
 2016-03-08 09:46:36 +01:00
verysecrethero fc3a3a8f2e Fixed a crashbug in Ammo/HealthPickup which was actually caused by systems being added twice in Game.cpp. This is also a possible fix for DamageIndicator,Capturepoint,TextField,KillFeed 2016-03-07 17:16:18 +01:00
Tobias Dahl 3edc2f4819 Merge pull request #174 from teamfisk/CapturePointFixBranch 
CapturePoints now have red/blue/spectator model-children
 2016-03-07 15:25:22 +01:00
verysecrethero 3eaad275ba New CapturePointAddition fixed to work on Network by Joachim 2016-03-07 14:50:31 +01:00
Tleety 47ece6a5bf Changed shield component to track Active, so it and sprint glow full if they are active. 
Changed how reflections are calculated with light.
 2016-03-07 14:42:50 +01:00
verysecrethero 64df3fd7ad CapturePoints now have red/blue/spectator model-children 2016-03-07 14:30:27 +01:00
Tleety 99d663d5a2 ShiftIcon should now track ability depending on what ability the player has and change icon accordingly. 2016-03-07 13:55:37 +01:00
Tleety c7099de9e4 Merge remote-tracking branch 'origin/master' into ScoreBoard 
# Conflicts:
#	assets
 2016-03-07 10:58:55 +01:00
Tleety cb9dad5c67 Merge remote-tracking branch 'origin/master' into ScoreBoard 2016-03-07 10:49:57 +01:00
Tleety a8f2d0a8e6 Some assets, some fixes to the scoreboard 2016-03-07 10:48:46 +01:00
Jace b7a7f7fd5e ???? 2016-03-04 15:02:01 +01:00
Jace 434ff1e7eb ???? 2016-03-04 10:06:49 +01:00
Jace e58b5ffd6f Merge remote-tracking branch 'origin/Movement' into Weapons 
# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
 2016-03-04 09:43:34 +01:00
viktorljung c1f5cf65a7 Movement animations 2016-03-04 09:39:16 +01:00
Jace 42cccfbac0 Merge branch 'Weapons' of github.com:teamfisk/TacticalZ into Weapons 
# Conflicts:
#	assets
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
 2016-03-04 08:56:58 +01:00
Jocke e2674d915e Constrained weapon behavior to client side only 2016-03-04 08:55:55 +01:00
Jace 2b55450c18 Cray cray weapons 2016-03-04 08:54:59 +01:00
viktorljung 7ba0e4ea9d Run, Strafe and jump animations now playing 2016-03-04 08:35:02 +01:00
Jocke d78a7e20e2 Merge branch 'master' into Weapons 2016-03-04 08:29:33 +01:00
Jocke eec40b6519 We can now read larger packets than 65536 bytes in TCPClient::readBuffer() 2016-03-04 05:10:18 +01:00
Jace 177667eef5 The only working branch ever 2016-03-04 05:02:25 +01:00
Joachim Pettersson e6472b9745 Merge pull request #170 from teamfisk/ScoreBoard 
I Hope To God That This Works.
 2016-03-04 04:03:46 +01:00
Tleety 19ee66fc75 Fix 2016-03-04 03:57:37 +01:00
Tobias Dahl 7675af1ef6 Merge pull request #168 from teamfisk/SniperSprintBranch 
Sniper sprint effect
 2016-03-04 03:31:53 +01:00
Jocke 0398006fdc added safety ifs and renamed dasheffect to sprinteffect 2016-03-04 03:19:41 +01:00
Jace dbafab2cef fixup! First attempt at AssaultWeapon animations! 2016-03-04 03:07:36 +01:00
Tleety 103fe98fe2 KD now updated 2016-03-04 03:06:42 +01:00
Jace 609f6619a6 Merge remote-tracking branch 'origin/Animations' into Weapons 2016-03-04 03:04:36 +01:00
Jace 03ea9bcf40 fixup! Duration no longer needed 2016-03-04 03:00:03 +01:00
Jace d37b7c2277 fixup! First attempt at AssaultWeapon animations! 2016-03-04 02:55:19 +01:00
viktorljung 1bd71931b8 Fixed crash when trying to blend to a nonexistent node 2016-03-04 02:53:23 +01:00
Tleety 0e95c5bb95 Fixes 2016-03-04 02:52:04 +01:00
Jace b7fa7f9119 Duration no longer needed 2016-03-04 02:50:03 +01:00
Jace 608e339172 Merge remote-tracking branch 'origin/Animations' into Weapons 2016-03-04 02:48:41 +01:00
Jace 3a8f7c5d03 First attempt at AssaultWeapon animations! 2016-03-04 02:48:03 +01:00
viktorljung 1ff91a5c5d fixup! Blend duration can now be 0.0 
Commited input test stuff
 2016-03-04 02:30:05 +01:00
viktorljung 49802fed91 Blend duration can now be 0.0 2016-03-04 02:24:13 +01:00
Tleety 45991000ae Removed unused code 2016-03-04 02:20:42 +01:00
Tleety 778bbd13ca double's should now be displayed with only 1 decimal. 2016-03-04 02:19:13 +01:00
viktorljung 1616fb20d1 Skinned meshes now in T-Pose when not it's blendtree is null 2016-03-04 02:03:50 +01:00
Tleety 00b5a1771c Should now work fully, not KD tho 2016-03-04 01:34:29 +01:00
Tleety 66374b7ff9 Should now track score correctly 2016-03-04 00:21:01 +01:00
Tleety fe7c1dd808 Merge remote-tracking branch 'origin/DeathEventUsesPlayerID' into ScoreBoard 
# Conflicts:
#	include/Engine/Network/Server.h
 2016-03-03 23:56:57 +01:00
Tleety 118d61c711 Should now remove players from scoreboard if they disconnect 2016-03-03 23:55:52 +01:00
Jace 4dd46e2e21 Merge branch 'master' into Weapons 2016-03-03 23:46:46 +01:00
Jace 7e6d32aaec Fixed AssaultWeapon reload logic 2016-03-03 23:45:28 +01:00
stiffly 2167b6f7b1 Fix for previous commit.. 2016-03-03 23:43:50 +01:00
viktorljung bebdacabb4 Clean up 2016-03-03 23:41:08 +01:00