Commit Graph

  • 1516ed8e2d Removed debug logging. PlayerID in InputCommands from buttons is corrected. William Moberg 2016-03-07 17:35:01 +01:00
  • 9e8df340b3 Merge remote-tracking branch 'origin/master' into NetworkComponent NetworkComponent stiffly 2016-03-07 17:21:24 +01:00
  • 2cfbe0f785 Merge remote-tracking branch 'origin/master' into AmmoPickup verysecrethero 2016-03-07 17:17:51 +01:00
  • 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 verysecrethero 2016-03-07 17:16:18 +01:00
  • b629ed5e2b Updated some known xml entities that should be send in snapshots. stiffly 2016-03-07 17:11:10 +01:00
  • f00fb836fb Oops. stiffly 2016-03-07 17:10:13 +01:00
  • 13c3bcb290 Now only entities with NetworkComponent will be send in Snapshots. stiffly 2016-03-07 16:52:51 +01:00
  • 7de95d4cb5 Mainmenu entity Tleety 2016-03-07 16:34:56 +01:00
  • f585f9ada9 Created the NetworkComponent xml file stiffly 2016-03-07 16:11:19 +01:00
  • 68a88ed756 We are now using udp again Jocke 2016-03-07 16:06:10 +01:00
  • ee99821164 Add reverse and scalar for ColorByDistance FakeShemp 2016-03-07 15:45:06 +01:00
  • 3edc2f4819 Merge pull request #174 from teamfisk/CapturePointFixBranch Tobias Dahl 2016-03-07 15:25:22 +01:00
  • 962521fa59 Merge branch 'master' into TeamPickCamera William Moberg 2016-03-07 15:20:46 +01:00
  • 9c3fa25834 Merge pull request #176 from teamfisk/PlayerHUD Adam Byléhn 2016-03-07 15:14:37 +01:00
  • 282e0bf7c4 Only set spectator camera if player haven't spawned already. Don't spawn player if they switch to class pick screen. William Moberg 2016-03-07 15:05:37 +01:00
  • 3eaad275ba New CapturePointAddition fixed to work on Network by Joachim verysecrethero 2016-03-07 14:50:31 +01:00
  • 47ece6a5bf Changed shield component to track Active, so it and sprint glow full if they are active. PlayerHUD Tleety 2016-03-07 14:42:50 +01:00
  • 9cc8124847 Renamed IsAnyParentMissingTransform -> isAnyParentMissingTransform (member function). stiffly 2016-03-07 14:34:45 +01:00
  • 64df3fd7ad CapturePoints now have red/blue/spectator model-children verysecrethero 2016-03-07 14:27:12 +01:00
  • 078d6eb712 Added sequnceNumber and totalNumberOfPackets to packet for packet splitting. Jocke 2016-03-07 14:22:09 +01:00
  • a369c26a28 Blend tree nodes can now exist without transform components, without the game crashing. stiffly 2016-03-07 14:19:22 +01:00
  • 53ea5bd37d comment out currently unused thing FakeShemp 2016-03-07 14:15:17 +01:00
  • b38ebbe676 Shadows now working on NVIDIA cards too Teejoon 2016-03-07 14:00:08 +01:00
  • 99d663d5a2 ShiftIcon should now track ability depending on what ability the player has and change icon accordingly. Tleety 2016-03-07 13:55:37 +01:00
  • 243276707a Merge remote-tracking branch 'origin/master' into ExplosionEffectV2 FakeShemp 2016-03-07 13:52:29 +01:00
  • 388fe7c259 Fixed some stuff on the player HUD Tleety 2016-03-07 11:28:10 +01:00
  • 46d7c8bea4 Merge pull request #172 from teamfisk/ScoreBoard Tobias Dahl 2016-03-07 11:09:17 +01:00
  • c7099de9e4 Merge remote-tracking branch 'origin/master' into ScoreBoard ScoreBoard Tleety 2016-03-07 10:58:55 +01:00
  • cb9dad5c67 Merge remote-tracking branch 'origin/master' into ScoreBoard Tleety 2016-03-07 10:49:57 +01:00
  • a8f2d0a8e6 Some assets, some fixes to the scoreboard Tleety 2016-03-07 10:48:46 +01:00
  • b7a7f7fd5e ???? Jace 2016-03-04 15:02:01 +01:00
  • 434ff1e7eb ???? Jace 2016-03-04 10:03:06 +01:00
  • 0dfe00b406 Unlocks mouse when changing to SpectatorCamera and locking when respawning. William Moberg 2016-03-04 09:49:27 +01:00
  • e58b5ffd6f Merge remote-tracking branch 'origin/Movement' into Weapons Jace 2016-03-04 09:43:34 +01:00
  • 4557455e49 HUD stuff Jace 2016-03-04 09:41:12 +01:00
  • c1f5cf65a7 Movement animations viktorljung 2016-03-04 09:39:16 +01:00
  • a8ad85b004 Merge remote-tracking branch 'origin/IconsForPlaytest' into Weapons Jace 2016-03-04 09:39:11 +01:00
  • 3ac8a5c7ef Working map Jace 2016-03-04 09:38:38 +01:00
  • ebd4c58c41 "Fixed" weapon spawning over network Jace 2016-03-04 09:23:18 +01:00
  • 42cccfbac0 Merge branch 'Weapons' of github.com:teamfisk/TacticalZ into Weapons Jace 2016-03-04 08:56:58 +01:00
  • e2674d915e Constrained weapon behavior to client side only Jocke 2016-03-04 08:55:55 +01:00
  • 2b55450c18 Cray cray weapons Jace 2016-03-04 08:54:59 +01:00
  • 7ba0e4ea9d Run, Strafe and jump animations now playing viktorljung 2016-03-04 08:35:02 +01:00
  • 7a2f1ac9fd Merge branch 'Weapons' into TeamPickCamera William Moberg 2016-03-04 08:34:27 +01:00
  • d78a7e20e2 Merge branch 'master' into Weapons Jocke 2016-03-04 08:29:33 +01:00
  • 5b80ba4398 Made 3 new healthHUDs 1 for each class. IconsForPlaytest Jocke 2016-03-04 08:22:48 +01:00
  • 03843774d7 Moved buttons and fixed so you can't spawn with no class. William Moberg 2016-03-04 07:01:47 +01:00
  • 2ecc53ecca Merge branch 'master' into TeamPickCamera William Moberg 2016-03-04 05:58:49 +01:00
  • 06614aa907 SpectatorCameraSystem handles the overwatch cameras. Set camera to a class pick screen when connecting. Cannot spawn until both team and class has been picked. William Moberg 2016-03-04 05:41:29 +01:00
  • 2187df080a Merge branch 'master' into IconsForPlaytest Jocke 2016-03-04 05:17:54 +01:00
  • eec40b6519 We can now read larger packets than 65536 bytes in TCPClient::readBuffer() Jocke 2016-03-04 05:10:18 +01:00
  • 177667eef5 The only working branch ever Jace 2016-03-04 05:02:25 +01:00
  • 1f047ea300 Latest Map version (Hopefully) Now with textures. Made some very minor tweaks as well, by removing duplicated meshes. antc13 2016-03-04 04:22:04 +01:00
  • e6472b9745 Merge pull request #170 from teamfisk/ScoreBoard Joachim Pettersson 2016-03-04 04:03:46 +01:00
  • 19ee66fc75 Fix Tleety 2016-03-04 03:57:37 +01:00
  • 7675af1ef6 Merge pull request #168 from teamfisk/SniperSprintBranch Tobias Dahl 2016-03-04 03:31:53 +01:00
  • 16124b7aa7 Crash fix stiffly 2016-03-04 03:31:51 +01:00
  • 2507516a85 Tweaked values for the effect to look better SniperSprintBranch Jocke 2016-03-04 03:28:58 +01:00
  • 0398006fdc added safety ifs and renamed dasheffect to sprinteffect Jocke 2016-03-04 03:19:41 +01:00
  • dbafab2cef fixup! First attempt at AssaultWeapon animations! Jace 2016-03-04 03:07:36 +01:00
  • 103fe98fe2 KD now updated Tleety 2016-03-04 03:06:42 +01:00
  • bc3c8299e8 Moved minidump code to MiniDump.cpp from main. MiniDump William Moberg 2016-03-04 03:05:09 +01:00
  • 609f6619a6 Merge remote-tracking branch 'origin/Animations' into Weapons Jace 2016-03-04 03:04:36 +01:00
  • a7c57da2c9 WIP stiffly 2016-03-04 03:03:38 +01:00
  • 03ea9bcf40 fixup! Duration no longer needed Jace 2016-03-04 03:00:03 +01:00
  • d37b7c2277 fixup! First attempt at AssaultWeapon animations! Jace 2016-03-04 02:55:19 +01:00
  • 1bd71931b8 Fixed crash when trying to blend to a nonexistent node Animations viktorljung 2016-03-04 02:53:23 +01:00
  • 0e95c5bb95 Fixes Tleety 2016-03-04 02:52:04 +01:00
  • b7fa7f9119 Duration no longer needed Jace 2016-03-04 02:50:03 +01:00
  • 608e339172 Merge remote-tracking branch 'origin/Animations' into Weapons Jace 2016-03-04 02:48:41 +01:00
  • 3a8f7c5d03 First attempt at AssaultWeapon animations! Jace 2016-03-04 02:48:03 +01:00
  • 1ff91a5c5d fixup! Blend duration can now be 0.0 viktorljung 2016-03-04 02:30:05 +01:00
  • 49802fed91 Blend duration can now be 0.0 viktorljung 2016-03-04 02:24:13 +01:00
  • 45991000ae Removed unused code Tleety 2016-03-04 02:20:42 +01:00
  • 778bbd13ca double's should now be displayed with only 1 decimal. Tleety 2016-03-04 02:19:13 +01:00
  • 1616fb20d1 Skinned meshes now in T-Pose when not it's blendtree is null viktorljung 2016-03-04 02:03:50 +01:00
  • 00b5a1771c Should now work fully, not KD tho Tleety 2016-03-04 01:34:29 +01:00
  • 86306b3132 Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-03-04 01:15:42 +01:00
  • 772fc64045 Merge remote-tracking branch 'origin/Playtest2-Fallback' into Playtest2-Fallback Playtest2-Fallback Jocke 2016-03-04 00:26:19 +01:00
  • ae230ef775 We can now read larger packets than 65536 bytes in TCPClient::readBuffer() Jocke 2016-03-04 00:24:47 +01:00
  • 66374b7ff9 Should now track score correctly Tleety 2016-03-04 00:21:01 +01:00
  • fe7c1dd808 Merge remote-tracking branch 'origin/DeathEventUsesPlayerID' into ScoreBoard Tleety 2016-03-03 23:56:57 +01:00
  • 118d61c711 Should now remove players from scoreboard if they disconnect Tleety 2016-03-03 23:55:52 +01:00
  • 4dd46e2e21 Merge branch 'master' into Weapons Jace 2016-03-03 23:46:46 +01:00
  • 7e6d32aaec Fixed AssaultWeapon reload logic Jace 2016-03-03 23:28:16 +01:00
  • 9426942988 Merge pull request #169 from teamfisk/Animations Jace 2016-03-03 23:45:24 +01:00
  • 2167b6f7b1 Fix for previous commit.. DeathEventUsesPlayerID stiffly 2016-03-03 23:43:50 +01:00
  • bebdacabb4 Clean up viktorljung 2016-03-03 23:41:08 +01:00
  • 66c8a17b17 Merge remote-tracking branch 'origin/master' into Animations viktorljung 2016-03-03 23:21:14 +01:00
  • e3fbd2082c BlendQueues fully working viktorljung 2016-03-03 23:20:13 +01:00
  • 217c3fe55c Fixes Jace 2016-03-03 22:58:45 +01:00
  • 0a21fe15dd Merge remote-tracking branch 'origin/master' into ScoreBoard Tleety 2016-03-03 22:56:39 +01:00
  • 011aa53bc0 ScoreScreen things Tleety 2016-03-03 22:55:18 +01:00
  • 714665f0a3 Updated the PlayerID getter in Server.cpp. stiffly 2016-03-03 22:55:12 +01:00
  • 8466a282b7 The server will now parse a death event and pass it forward with a KillDeath event to the score system. stiffly 2016-03-03 22:48:42 +01:00
  • 80ad76c023 Merge branch 'Playtest2-Fallback' of github.com:teamfisk/TacticalZ into Playtest2-Fallback Jace 2016-03-03 22:25:46 +01:00
  • c84d7ebb8f PlayerAssaultFallbackBlue and PlayerAssaultFallbackRed Jace 2016-03-03 22:25:07 +01:00
  • ae13a2db6b Player cannot see their own sprint effect. Jocke 2016-03-03 22:09:51 +01:00
  • 984b8ad3e9 SprintEffect defaults to 30% extra speed. Jocke 2016-03-03 21:57:27 +01:00
  • f5ea4e06c7 Map Tleety 2016-03-03 21:37:18 +01:00