Commit Graph

  • ba9419b342 Moved UDP logic from Hybrid server/client to UDP server/client. fixed bug in Server::CheckForTimeOuts. Jocke 2016-02-08 14:32:00 +01:00
  • 14c5410524 Merge fix stiffly 2016-02-08 14:29:55 +01:00
  • 9da1419895 Merge remote-tracking branch 'origin/master' into Sound stiffly 2016-02-08 14:24:44 +01:00
  • 8e86cc2123 Walking sound logic moved to PlayerMovementSystem and makes use of "wishDirection" to alleviate the problem where m_DistanceMoved were reset when it was not supposed to. stiffly 2016-02-08 14:23:53 +01:00
  • 11cf85cc73 Renamed CollidableOctreeSystem to FillOctreeSystem. William Moberg 2016-02-08 14:17:19 +01:00
  • 3a5c0a2762 SoundSystem does not longer inherit from SoundManager. SoundManager is a individual class that listens to events. The SoundManager only listens to the local player. stiffly 2016-02-08 14:01:32 +01:00
  • 12c05d5a1c Added an Queue event for sound emitters. stiffly 2016-02-08 13:59:35 +01:00
  • 2b4e00e4b0 Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags. Jace 2016-02-08 13:32:00 +01:00
  • 6610bb974d Only apply air friction if the ground is never hit during the frame. William Moberg 2016-02-08 13:32:45 +01:00
  • d2cfa592f0 Supports skinnd and unskinned meshes Teejoon 2016-02-08 13:01:10 +01:00
  • 971beb29d8 Merge remote-tracking branch 'origin/master' into DefenderShield Tleety 2016-02-08 12:30:41 +01:00
  • 2ee21e05d4 Fixed so that Shielded objects can be picked. Shield objects can not however, so they will not be able to be picked in editor either. Tleety 2016-02-08 12:29:41 +01:00
  • 5987751add Merge pull request #81 from teamfisk/HealthPickup William Moberg 2016-02-08 11:50:47 +01:00
  • 94b59af973 Defender shield should now be working Tleety 2016-02-08 11:47:35 +01:00
  • 70f8237a16 Merge pull request #60 from teamfisk/3rdPersonDeathCam Jace 2016-02-08 11:39:57 +01:00
  • 99cbdd3c1e Player death effect fixes Jace 2016-02-08 11:39:29 +01:00
  • 503613907e Merge remote-tracking branch 'origin/master' into HealthPickup verysecrethero 2016-02-08 11:39:05 +01:00
  • 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. verysecrethero 2016-02-08 11:22:28 +01:00
  • 35b0193f15 Merge pull request #72 from teamfisk/BoxModelCollision Jace 2016-02-08 10:29:41 +01:00
  • f8e514d21e Merge remote-tracking branch 'origin/master' into HealthPickup verysecrethero 2016-02-08 10:22:35 +01:00
  • fad25c6e16 Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam verysecrethero 2016-02-08 10:21:30 +01:00
  • 4bf91ba56a Merge remote-tracking branch 'origin/master' into AssaultBoost verysecrethero 2016-02-08 10:12:13 +01:00
  • 43719f8304 Added texture tiling to shaders (exkluding ExplosinEffects) Teejoon 2016-02-07 15:27:26 +01:00
  • 92ab22e779 Splatmapping now working. Teejoon 2016-02-07 13:39:13 +01:00
  • 933a32aa8d Animations kind of working viktorljung 2016-02-06 18:09:51 +01:00
  • 88d7b79cd3 TCP and UDP Client are working for 1 connected player, more players are not tested yet Jocke 2016-02-05 18:30:31 +01:00
  • 4103c878ec Refactoring: Changed HealthPickupSystem to use a struct instead. Removed the Id in EPickupSpawned verysecrethero 2016-02-05 18:05:46 +01:00
  • 09fb3a6571 Added some comments. stiffly 2016-02-05 18:04:36 +01:00
  • 40788c7400 Merge pull request #80 from teamfisk/DashFixBranch William Moberg 2016-02-05 18:04:15 +01:00
  • becb197feb Player walk is now based on distance traveled, and it is also reset when key is released. However when dashing the player step sound is still played. The distance of a step is also hard coded in the header file. Will config it up some day. stiffly 2016-02-05 17:46:27 +01:00
  • 59bdc614f2 Put SpecialAbility on left shift, and Sprint on left shift in DefaultInput. William Moberg 2016-02-05 17:34:19 +01:00
  • 6542d1b444 Shadow WIP Ayumiwii 2016-02-05 17:29:53 +01:00
  • 454eef8225 WIP. Improving player walk logic. stiffly 2016-02-05 17:21:48 +01:00
  • febbadbd01 Accidentally added the sound system twice. Lead to funny behavior. stiffly 2016-02-05 17:21:31 +01:00
  • 8034b42c87 spriteComponent WIP viktorljung 2016-02-05 16:43:57 +01:00
  • fbdaf92953 Started refactoring. Put player walk logic in a designated sound system. stiffly 2016-02-05 16:39:23 +01:00
  • 3e2afd7bf2 Added dash sound stiffly 2016-02-05 16:37:56 +01:00
  • be628d9406 Merge remote-tracking branch 'origin/master' into HealthPickup verysecrethero 2016-02-05 16:23:22 +01:00
  • 66f442f1af Added HealthGain to HealthPickup component. Changed PickupSpawnSystem so it copies the values from the old to the new entity. verysecrethero 2016-02-05 16:13:59 +01:00
  • bbf6058c17 Shadow WIP Ayumiwii 2016-02-05 16:13:46 +01:00
  • 2542397511 Miscellaneous small fixes: For Tests, CapturePoint xml file, HealthSystem, DashAbility xml file. verysecrethero 2016-02-05 15:35:51 +01:00
  • 0e51ae7dc9 shadow wip Ayumiwii 2016-02-05 15:31:20 +01:00
  • 7641ba49c7 Weapon doesn't explode in first person. William Moberg 2016-02-05 15:16:24 +01:00
  • 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. verysecrethero 2016-02-05 15:15:04 +01:00
  • c912cd7a42 Shadows wip Ayumiwii 2016-02-05 15:12:17 +01:00
  • 7f1016476b Shadows WIP Ayumiwii 2016-02-05 15:08:56 +01:00
  • e3a44d37d2 Merge branch 'master' into BoxModelCollision William Moberg 2016-02-05 14:59:14 +01:00
  • 428dca003d Tiny bug fix. William Moberg 2016-02-05 14:40:50 +01:00
  • 4fe9e4f1c3 Debug cleanup and some bug fixes. William Moberg 2016-02-05 14:38:08 +01:00
  • e90f802d48 Merge remote-tracking branch 'origin/master' into Sound stiffly 2016-02-05 13:59:21 +01:00
  • ceab837e27 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer Teejoon 2016-02-05 13:59:01 +01:00
  • d1a309be10 Now supports reading of 3 different types of materials Teejoon 2016-02-05 13:51:47 +01:00
  • d61e605093 Can walk up "stair-steps". Cleanup WIP. William Moberg 2016-02-05 10:56:34 +01:00
  • 71a86cab11 removed event that's not being used stiffly 2016-02-05 10:07:56 +01:00
  • b6e0332574 Fixed support for new animation structure, not done yet viktorljung 2016-02-05 10:07:22 +01:00
  • c526a7af55 WIP stencil stuff Tleety 2016-02-04 17:58:36 +01:00
  • 6a23a987b3 Started PickupSpawnSystem, added 2 events and a system verysecrethero 2016-02-04 17:43:45 +01:00
  • 047e71a4e1 Added BoostAssault,BoostDefender components. Added their effects in HealthSystem,PlayerMovementSystem verysecrethero 2016-02-04 16:18:54 +01:00
  • d50caa1763 Gain events tested. works as intended stiffly 2016-02-04 16:14:50 +01:00
  • 9232b24a7b WIP Reliable message Jocke 2016-02-04 15:49:04 +01:00
  • c272857819 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer Teejoon 2016-02-04 15:05:00 +01:00
  • 336b058c9f WIP, commit to be able to pull stuff down Teejoon 2016-02-04 14:58:46 +01:00
  • 7c582898f4 Working stencil buffer for the shield. Tleety 2016-02-04 14:33:39 +01:00
  • 3a2b124cae Replication flag in component definition. Component definitions should now inherit from Types/Component.xsd Jace 2016-02-03 14:44:56 +01:00
  • 02b69a86e7 Fixed DEBUG_IF Jace 2016-02-03 14:43:50 +01:00
  • ff26e1235c Merge pull request #77 from teamfisk/AMDCrashFix Jace 2016-02-04 12:05:05 +01:00
  • 571c41589a Merge remote-tracking branch 'origin/Importer' into Animations viktorljung 2016-02-04 11:54:20 +01:00
  • 35376178b1 WIP viktorljung 2016-02-04 11:54:13 +01:00
  • 6990e473b3 Adding a clear here makes AMD drivers NOT crash for some reason. We're fixing the symptom but not the underlying cause. Jace 2016-02-04 11:53:35 +01:00
  • 84499665d0 Changed vertices to skinnedVertices in RawModelCustom.cpp antc13 2016-02-04 11:53:17 +01:00
  • c87e4d4fd6 Added mutex to resource manager cache reading to avoid a potential race condition. We hope this is the actual bug we saw. Jace 2016-02-04 11:53:11 +01:00
  • d4292d4b43 Merge pull request #63 from teamfisk/AssaultDash verysecrethero 2016-02-04 11:50:00 +01:00
  • 774e17ffc9 Merge remote-tracking branch 'origin/master' into AssaultDash verysecrethero 2016-02-04 11:42:14 +01:00
  • 035c79564b Changed Dash name to DashAbility. Fixed dash bug where you could do two different keys to dash. verysecrethero 2016-02-04 11:41:21 +01:00
  • 2733efdc0d Merge remote-tracking branch 'origin/Importer' into Animations viktorljung 2016-02-04 11:32:44 +01:00
  • afa4f425a8 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer antc13 2016-02-04 11:26:23 +01:00
  • 356cf72b0f Changed the structure of the Animation Data in both Exporter & Importer. antc13 2016-02-04 11:25:31 +01:00
  • 6aec7555cc WIP Waiting for importer viktorljung 2016-02-04 11:13:33 +01:00
  • 379d211832 some fixes with the stencil states and implemented stencil func/stencilop/stencilmask to renderstate Tleety 2016-02-04 11:13:26 +01:00
  • cf43817658 Final pass AssetSorting FakeShemp 2016-02-04 10:54:34 +01:00
  • 0a8ee1623f Merge remote-tracking branch 'origin/master' into Sound stiffly 2016-02-04 10:47:30 +01:00
  • 03a16b46b5 Dash component now has the dash-maxCoolDownVariable in it. verysecrethero 2016-02-04 10:28:28 +01:00
  • 0bbaf1d576 Oops! Removed DebugCode... verysecrethero 2016-02-04 10:04:44 +01:00
  • bc01e147c2 Some state stuff, some draw stuff, some QA map stuff Tleety 2016-02-03 18:09:44 +01:00
  • 4769970715 Another pass FakeShemp 2016-02-03 18:03:46 +01:00
  • 1bd4aa91ff Oops! Readded "Sprint" command. Removed some unnecessary variables in FirstPersonInputController. Fixed bug where you couldnt dash right away as the game started. verysecrethero 2016-02-03 17:45:37 +01:00
  • 3c8159220c First pass FakeShemp 2016-02-03 17:31:16 +01:00
  • 7b5a2a5388 Dashing now works great both with shift and doubletap. Added Dash Component. Changed default Player.xml to have a Dash Component. Disabled Sprint. You can now disable DoubleTapToDash in Input.Ini. Added command "SpecialAbility". verysecrethero 2016-02-03 17:30:46 +01:00
  • 2e3e59a1e2 Merge remote-tracking branch 'origin/master' into Sound stiffly 2016-02-03 16:10:11 +01:00
  • bd2da7bc9f Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping"" Jace 2016-02-03 16:30:00 +01:00
  • b56824786c Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping" Jace 2016-02-03 16:16:06 +01:00
  • c2833b10c4 Hard coded (read retarded) improvements added to player walk logic stiffly 2016-02-03 15:55:32 +01:00
  • 938caa6ba2 Now uses OnComponentAttached event. Can now queue sound on a source. stiffly 2016-02-03 15:48:25 +01:00
  • 13161b4f57 Merge remote-tracking branch 'origin/master' into AssaultDash verysecrethero 2016-02-03 15:07:19 +01:00
  • 5665c0f298 Models with Shield and shielded component now added to queues Tleety 2016-02-03 14:20:47 +01:00
  • 7ffbd8455f Added Queues for the models with shield and shielded components. Tleety 2016-02-03 13:53:57 +01:00
  • 83713b3b6d Renamde ShieldComponent since Component should not be in the name. Added Shielded component that will be put on objects that should be hidden behind shields. Tleety 2016-02-03 13:27:46 +01:00
  • 7bae2d0873 Added a ShieldComponent and a test area in QA map for defender shield Tleety 2016-02-03 11:58:06 +01:00
  • 9d3171540d AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash verysecrethero 2016-02-03 11:54:14 +01:00
  • 2391a0dbe9 Merge remote-tracking branch 'origin/master' into AssaultDash verysecrethero 2016-02-03 11:51:26 +01:00