BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 85ba5552e9 Merge remote-tracking branch 'origin/master' into FixNetworkBugs Jocke 2016-03-02 17:59:20 +01:00
  • 76117cb3ce Merge pull request #155 from teamfisk/Respawning Joachim Pettersson 2016-03-02 17:55:32 +01:00
  • e6b3bbeb54 Merge remote-tracking branch 'origin/master' into Respawning William Moberg 2016-03-02 17:50:59 +01:00
  • 01def459a1 Merge pull request #159 from teamfisk/FloatingEffect Tobias Dahl 2016-03-02 17:49:25 +01:00
  • 3094dd301b Added a default value to Position in FloatingEffect.xml antc13 2016-03-02 17:47:22 +01:00
  • 76ab746a22 Merge pull request #157 from teamfisk/DashAbiltyEffect William Moberg 2016-03-02 17:43:55 +01:00
  • e9bbb5ed2a Fixed BlendTree crash when animation nodes are null viktorljung 2016-03-02 17:42:55 +01:00
  • edf481b4d7 Load the error texture when a texture isn't found instead of just passing null to OpenGL! Jace 2016-03-02 17:42:27 +01:00
  • e56f203f7c Removed unnecessary comment & added FloatingEffect to Schema/Types/Entity.xsd antc13 2016-03-02 17:42:11 +01:00
  • 267c007291 Removed unnecessary comments, variables and functions. stiffly 2016-03-02 17:39:27 +01:00
  • 8b66d29adc Skeleton system for Boost icons Tleety 2016-03-02 17:32:45 +01:00
  • 7d15313209 Added a FloatingEffectSystem to the game. Pickups now move up and down, if so desired. antc13 2016-03-02 17:22:44 +01:00
  • a9a19193ad Component for Boost icons Tleety 2016-03-02 17:21:15 +01:00
  • f84d1ac4a1 Merge remote-tracking branch 'origin/master' into SniperSprintBranch verysecrethero 2016-03-02 17:11:36 +01:00
  • d8a0e69ff0 fixup! AutoAnimationBlend now working correctly for unique nodes, Commited debug code viktorljung 2016-03-02 17:11:18 +01:00
  • 53c520123a Uncommented code. William Moberg 2016-03-02 17:06:53 +01:00
  • 1aefa1dec6 AutoAnimationBlend now working correctly for unique nodes viktorljung 2016-03-02 17:06:51 +01:00
  • 0a6653d079 Merge remote-tracking branch 'origin/master' into FixNetworkBugs Jocke 2016-03-02 17:06:24 +01:00
  • a20ef0504a Revert "Merge remote-tracking branch 'origin/master' into SniperSprint" SniperSprint verysecrethero 2016-03-02 16:58:24 +01:00
  • 92d5ec70ba Merge remote-tracking branch 'origin/master' into DashAbiltyEffect stiffly 2016-03-02 16:57:07 +01:00
  • 233a1d0990 The dash effect is now ignored on the local player, because it was annoying. Copies of yourself could be in your way. stiffly 2016-03-02 16:56:43 +01:00
  • 4e68f9063b Revert "Merge remote-tracking branch 'origin/master' into SniperSprint" verysecrethero 2016-03-02 16:55:56 +01:00
  • 4ef76f6c45 Merge branch 'master' into Respawning William Moberg 2016-03-02 16:51:24 +01:00
  • dbef995627 Merge remote-tracking branch 'origin/master' into SniperSprint verysecrethero 2016-03-02 16:50:09 +01:00
  • f8f4b4d939 Merge pull request #151 from teamfisk/CPArrow Joachim Pettersson 2016-03-02 16:48:52 +01:00
  • a5c086e389 Dash effect now working over network, by sending events. Similar to jump effect. stiffly 2016-03-02 16:48:38 +01:00
  • 91dbbb9c11 Merge branch 'master' into Respawning William Moberg 2016-03-02 16:47:55 +01:00
  • 62653cf65d Merge remote-tracking branch 'origin/master' into SniperSprint verysecrethero 2016-03-02 16:47:43 +01:00
  • 78835f95d8 Removed comment Tleety 2016-03-02 16:47:30 +01:00
  • dc10661e6b Respawn time now only displays numbers, centered below CPHUD. William Moberg 2016-03-02 16:45:43 +01:00
  • 8a66b1e5c8 Merge pull request #119 from teamfisk/AssaultBoost Tobias Dahl 2016-03-02 16:44:49 +01:00
  • 3c8df35be9 Merge remote-tracking branch 'origin/master' into AssaultBoost verysecrethero 2016-03-02 15:59:16 +01:00
  • f761416e20 Merge pull request #152 from teamfisk/PickupBranch Joachim Pettersson 2016-03-02 15:41:44 +01:00
  • 9161c11764 Changed m_ETriggerTouchVector for-loop so it wont break when an item triggers the condition. This is done to update all somePickup.DecreaseThisRespawnTimer's. Jocke 2016-03-02 15:31:42 +01:00
  • cdbc348cfa AbilityCooldownHUD should now correctly track cooldown for dash ability. Tleety 2016-03-02 14:46:37 +01:00
  • 95078b6a4b Fix so client doesn't override the servers respawn time with its config file. Server or single player client can still override the component with the config RespawnTime. William Moberg 2016-03-02 14:37:33 +01:00
  • 502a290d36 Merge branch 'master' into HUD-Timers Tleety 2016-03-02 14:22:13 +01:00
  • 1217b25d02 DashEffect will now spawn a player model behind the player that will fade out . stiffly 2016-03-02 14:15:20 +01:00
  • a2b938d8f6 Merge branch 'master' into CPArrow Tleety 2016-03-02 13:58:44 +01:00
  • ab7fd89546 Should now correctly track if another player takes your last capture point Tleety 2016-03-02 13:56:35 +01:00
  • 8422742a9e Merge remote-tracking branch 'origin/master' into Animations viktorljung 2016-03-02 13:50:08 +01:00
  • 06d60f9884 Merge branch 'master' into Respawning William Moberg 2016-03-02 13:47:03 +01:00
  • 7b32d92170 Merge with master Teejoon 2016-03-02 13:45:56 +01:00
  • 629ebb871f SpectatorCamera shows capturepoint HUD and respawntimer. It no longer requires CapturePointGameMode component to work. William Moberg 2016-03-02 13:45:49 +01:00
  • 6968e71e07 Arrow should now correctly track the next point no matter when you join the game Tleety 2016-03-02 13:36:24 +01:00
  • c3f24f494d fixup! AutoAnimationBlend on unique node working but scale is not working correctly viktorljung 2016-03-02 13:34:47 +01:00
  • 07ccb9c041 AutoAnimationBlend on unique node working but scale is not working correctly viktorljung 2016-03-02 13:30:04 +01:00
  • 46eaedb186 Merge remote-tracking branch 'origin/master' into Importer Teejoon 2016-03-02 13:19:40 +01:00
  • 2fb3bb2a39 Merge pull request #153 from teamfisk/RenderSetingsV2 Tobias Dahl 2016-03-02 13:15:52 +01:00
  • 6540848392 WIP Tleety 2016-03-02 11:59:56 +01:00
  • de9657700b Fixed draw final pass with shided objects having to many if-statments. RenderSetingsV2 Teejoon 2016-03-02 11:59:48 +01:00
  • 4652cd7861 Added the already-at-maxammo/health-save-trigger for the PickupSystems verysecrethero 2016-03-02 11:53:04 +01:00
  • e6f46b396e Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-03-02 11:44:29 +01:00
  • b7fac7103d More reasonable distance to hear sounds by other players. Modeified by rolloff factor. stiffly 2016-03-02 11:26:06 +01:00
  • cfba8efd24 WritePrimitive would spam a warning when snapshots got bigger than 512 and it got resized. Jocke 2016-03-02 10:59:03 +01:00
  • 5a6374f013 Fix the remainder of errors. Might have borked splatmap in the process. FakeShemp 2016-03-02 10:57:22 +01:00
  • 0cf92e99ff wip FakeShemp 2016-03-02 10:17:49 +01:00
  • 03a35d0f5e Merge pull request #149 from teamfisk/FixNetworkBugs verysecrethero 2016-03-02 10:11:52 +01:00
  • e4e9af5d9c Merge pull request #148 from teamfisk/DashFixBranch Tobias Dahl 2016-03-02 10:05:02 +01:00
  • 96768e66de Redplayer arrow fix Tleety 2016-03-02 09:57:41 +01:00
  • ef66f3ebe5 Transparancy with shild fix Teejoon 2016-03-01 23:14:23 +01:00
  • 3ba73b8206 Pulsate system implemented. FakeShemp 2016-03-01 23:05:27 +01:00
  • 799990f44d Next CP indicator should now be fully working. Tleety 2016-03-01 22:54:13 +01:00
  • f31440b022 WIP Defender-v2 Jace 2016-03-01 22:37:19 +01:00
  • 007dc2aace Updated Player.xml for multiple weapons Jace 2016-03-01 16:35:54 +01:00
  • b2eee10602 HACK: Added Activate button for spawners in editor. Right now it includes the event from Game, but SpawnerSystem should probably be moved to Engine. Jace 2016-03-01 16:35:30 +01:00
  • e4c6a19c38 New weapon behaviours Jace 2016-03-01 13:26:50 +01:00
  • 39369aa3e5 Merge pull request #150 from teamfisk/EditorCameraSpeedFix Jace 2016-03-01 22:51:16 +01:00
  • 6eb0b83d6b Fixed editor camera speed changing when scrolling on UI elements Jace 2016-03-01 22:46:19 +01:00
  • ab40fa715b The arrow should now track CapturePoints correctly at start and when they are captured. Tleety 2016-03-01 21:57:30 +01:00
  • a38c18fd3a Merge remote-tracking branch 'origin/master' into CPArrow Tleety 2016-03-01 20:33:30 +01:00
  • 9747a201b7 Merge pull request #147 from teamfisk/CapturePointFixBranch Tobias Dahl 2016-03-01 20:33:10 +01:00
  • 6281e20000 Arrow should now track the CapturePoint specified in the Component. Tleety 2016-03-01 20:31:09 +01:00
  • 1ae2f3f5f3 Begin clean-up FakeShemp 2016-03-01 19:10:13 +01:00
  • f147929aa9 Moved the Dash CoolDown (CoolDownTimer) to the component (DashAbility). Fixed 2 warnings DashFixBranch verysecrethero 2016-03-01 17:57:18 +01:00
  • aadfdfdd90 AmmoPickups and HealthPickups will only spawn on the server. When a ammo pickup is taken the Server will send an Event to that Jocke 2016-03-01 17:55:00 +01:00
  • 5a8261453e Eliminated some SAXParsing errors from our console output. William Moberg 2016-03-01 17:40:42 +01:00
  • bba002dea9 Removed DebugCode verysecrethero 2016-03-01 17:37:30 +01:00
  • 15195964da ECaptured: added NextCapturePoint entitywrapper. Changed CapturePointID to CapturePointTakenID. Fixed so CapturePoints works in singleplayer again. Captured event is now sent in the next Update, since the information for NextCapturePoint is needed verysecrethero 2016-03-01 17:34:30 +01:00
  • a9762f44ca Merge branch 'master' into Respawning William Moberg 2016-03-01 17:34:23 +01:00
  • 3d4427dd20 Added entity SpectatorCamera that shows respawntime, will activate when explosion effect is deleted. William Moberg 2016-03-01 17:32:14 +01:00
  • b0a66f9e83 Components for CapturePoint arrow HUD element and a system skeleton Tleety 2016-03-01 16:19:59 +01:00
  • 63e8fb4bc8 misc verysecrethero 2016-03-01 16:11:55 +01:00
  • 5c6a652316 Fixed so unregistered components are ignored instead of crashing the game. William Moberg 2016-03-01 15:53:59 +01:00
  • 7ba5e01560 CapturePointArrow component files Tleety 2016-03-01 15:37:28 +01:00
  • 25331ddd70 Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-03-01 15:28:27 +01:00
  • 141c58005f Changing Models WIP antc13 2016-03-01 15:28:22 +01:00
  • 6d68486c05 Merge remote-tracking branch 'origin/master' into FixNetworkBugs Jocke 2016-03-01 15:07:06 +01:00
  • 842f26d8fc HealthPickupSystem seems to work ok verysecrethero 2016-03-01 14:57:50 +01:00
  • d3ffb9768b Sets velocity to 0, does not make use of doppler effect atm stiffly 2016-03-01 14:47:57 +01:00
  • 1b2055e11a initial fixes verysecrethero 2016-03-01 14:05:17 +01:00
  • c60e1ba7e4 Merge pull request #144 from teamfisk/RenderSetingsV2 Jace 2016-03-01 13:49:38 +01:00
  • 63d205f56a Merge pull request #146 from teamfisk/EditorKeyboardFix Tobias Dahl 2016-03-01 13:46:01 +01:00
  • 36f6ade87a Fixed editor keyboard shortcuts getting mixed up with GUI input actions EditorKeyboardFix Jace 2016-03-01 13:36:34 +01:00
  • fcf5117952 Merge remote-tracking branch 'origin/master' into ExplosionEffectV2 FakeShemp 2016-03-01 13:35:07 +01:00
  • 1961c16fe2 add weight slider FakeShemp 2016-03-01 13:27:52 +01:00
  • d32a483bb4 remove farclip override FakeShemp 2016-03-01 13:17:17 +01:00
  • e23ea78aeb Merge remote-tracking branch 'origin/master' into Shadows FakeShemp 2016-03-01 13:04:11 +01:00
  • 724d7b1586 Merge remote-tracking branch 'origin/master' into RenderSetingsV2 Teejoon 2016-03-01 12:56:00 +01:00
  • 8cda614de4 Added transparent object that disappeared from the merge Teejoon 2016-03-01 12:54:01 +01:00