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

Commit Graph

  • b1148c0c6c Added a afterimage SprintEffect for the Sniper. Jocke 2016-03-03 21:24:31 +01:00
  • 1227a795d7 WIP stiffly 2016-03-03 21:23:53 +01:00
  • 68332102ea Can now blend non unique nodes viktorljung 2016-03-03 21:20:55 +01:00
  • 6532e9896e fixup! Playtest 2 Fallback Map Jace 2016-03-03 21:05:21 +01:00
  • e24a0b127b Added Ability cooldown UI and missing texture Jace 2016-03-03 20:59:30 +01:00
  • 00c585de3c Score should now track to all clients Tleety 2016-03-03 20:45:16 +01:00
  • c0e160833c Playtest 2 Fallback Map Jace 2016-03-03 20:39:21 +01:00
  • cbb2ec2fd6 Unique ids for entity nodes in the editor to prevent weird behaviour when multiple entities have the same name Jace 2016-02-02 20:50:46 +01:00
  • c467d54d44 Merge pull request #167 from teamfisk/Weapons Jace 2016-03-03 20:43:13 +01:00
  • 0e5810d39e Merge branch 'master' into Weapons Jace 2016-03-03 20:41:50 +01:00
  • 1cc92f4800 Merge remote-tracking branch 'origin/master' into Kill-streak-sounds stiffly 2016-03-03 20:25:43 +01:00
  • 3613d66d32 The EPlaySoundOnEntity event now has support to set the gain on the sound. It now also uses EntityWrapper instead of EntityID. stiffly 2016-03-03 20:24:48 +01:00
  • eba296196c Merge remote-tracking branch 'origin/master' into Weapons Jace 2016-03-03 20:05:10 +01:00
  • b2371f4a43 Working AssaultWeapon Jace 2016-03-03 20:00:42 +01:00
  • f1c5df1418 Merge branch 'master' of github.com:teamfisk/TacticalZ maqu14 2016-03-03 19:58:53 +01:00
  • a5c1e34b8d Merge remote-tracking branch 'origin/master' into SniperSprintBranch Jocke 2016-03-03 18:49:42 +01:00
  • e55a399bad Merge pull request #165 from teamfisk/PickClassCamera Jace 2016-03-03 18:41:04 +01:00
  • 06b7052bf2 Merge remote-tracking branch 'origin/master' into SniperSprintBranch Jocke 2016-03-03 18:26:47 +01:00
  • 2dfcd3ad95 Merge pull request #158 from teamfisk/SniperSprintBranch Joachim Pettersson 2016-03-03 18:25:38 +01:00
  • 44924ea1f9 Merge pull request #166 from teamfisk/FixNetworkBugs Adam Byléhn 2016-03-03 18:22:13 +01:00
  • 7943fc7ad6 Hot fix: Infinite loop when a player disconnected from the server. FixNetworkBugs Jocke 2016-03-03 18:14:33 +01:00
  • be331cb778 fixed verysecrethero 2016-03-03 18:05:10 +01:00
  • a3494b92c8 Blending queues now working viktorljung 2016-03-03 17:48:25 +01:00
  • e7de7ccf8c Just a reminder to not return at friendly fire because of Boosts AssaultBoost verysecrethero 2016-03-03 17:47:07 +01:00
  • a72dc94d5d Merge branch 'SniperSprintBranch' of github.com:teamfisk/TacticalZ into SniperSprintBranch verysecrethero 2016-03-03 17:35:17 +01:00
  • c5f3bfc0cd Fixed the stuff in comments verysecrethero 2016-03-03 17:33:41 +01:00
  • 20c6caa408 Merge remote-tracking branch 'origin/master' into Kill-streak-sounds stiffly 2016-03-03 17:32:04 +01:00
  • dc88074f7f Merge remote-tracking branch 'origin/master' into MiniDump verysecrethero 2016-03-03 17:03:06 +01:00
  • 98366ec038 PickClass used for class-picking, SwapToClassPick to swap camera. William Moberg 2016-03-03 16:59:17 +01:00
  • db09d93111 Minidump stage 2 fix verysecrethero 2016-03-03 16:41:47 +01:00
  • 398bc725b6 When pick class buttons are clicked they send an InputCommand, not an ButtonClicked event. William Moberg 2016-03-03 16:32:24 +01:00
  • cc34f53b16 Memorydump stage 1 fix verysecrethero 2016-03-03 16:07:35 +01:00
  • 3e9ad7dc14 Merge remote-tracking branch 'origin/master' into ScoreBoard Tleety 2016-03-03 15:57:26 +01:00
  • fe36e8b423 Merge pull request #164 from teamfisk/FixNetworkBugs Tobias Dahl 2016-03-03 15:57:02 +01:00
  • 8b86c73ecc Merge remote-tracking branch 'origin/FixNetworkBugs' into ScoreBoard Tleety 2016-03-03 15:49:15 +01:00
  • 8859f652b9 Input ClassPick now switches to a camera with class buttons, they do nothing now and have test textures. William Moberg 2016-03-03 15:48:55 +01:00
  • c125f8c5f5 Merge branch 'master' into ScoreBoard Tleety 2016-03-03 15:18:46 +01:00
  • a7bff92899 The readBuffer now checks if the whole packet has arrived before attempting to parse it. stiffly 2016-03-03 15:16:42 +01:00
  • 315eac1af9 try not to assume things. FakeShemp 2016-03-03 15:10:27 +01:00
  • 4ee52b74bf Fix broken shader in. FakeShemp 2016-03-03 15:04:10 +01:00
  • d2f47e754f Remove shitty commented out thingie causing an error FakeShemp 2016-03-03 14:46:01 +01:00
  • bfcf7b240e Merge pull request #163 from teamfisk/revert-145-Shadows Tobias Dahl 2016-03-03 14:25:10 +01:00
  • 73b8bff1f3 Revert "Shadows" revert-145-Shadows Tobias Dahl 2016-03-03 14:24:43 +01:00
  • ed1d203c72 Merge branch 'master' into ScoreBoard Tleety 2016-03-03 14:07:44 +01:00
  • 1deb506fb2 Merge pull request #145 from teamfisk/Shadows Tobias Dahl 2016-03-03 14:06:48 +01:00
  • 8957b0b464 Merge remote-tracking branch 'origin/master' into Animations viktorljung 2016-03-03 14:05:43 +01:00
  • f4983cf961 WIP Tleety 2016-03-03 13:53:40 +01:00
  • 1210c91535 Added Gameplay.AutoReload bool to config Jace 2016-03-03 13:51:47 +01:00
  • ae3cab6cd1 Merge remote-tracking branch 'origin/master' into FixNetworkBugs Jocke 2016-03-03 13:31:43 +01:00
  • 2cd39c7188 New map version (NewMap2version4NEW) maqu14 2016-03-03 13:31:17 +01:00
  • a9b19d9af1 Packet write now only warns when a a packet is huge Jocke 2016-03-03 13:29:45 +01:00
  • 9c1a638a41 New map (NewMap2version4NEW) maqu14 2016-03-03 13:28:18 +01:00
  • 96bc5db7bb Merge commit '0e8b97dbbade6bb39c6f2b8af6c1cfc43ce67cde' into ScoreBoard Tleety 2016-03-03 13:22:28 +01:00
  • c8aeae2c96 WIP Tleety 2016-03-03 12:58:35 +01:00
  • da81f21799 Merge remote-tracking branch 'origin/master' into SniperSprintBranch Jocke 2016-03-03 12:16:09 +01:00
  • cb7beae28c Only do physics and collision calculations on the clients side, and only for their own entity. Jocke 2016-03-03 11:39:00 +01:00
  • ff6e2167d4 Some new events and changes to ScoreSystem Tleety 2016-03-03 11:25:06 +01:00
  • 27d3ec4118 Added some fields in score components to track more data. Added some logic to the ScoreSystem class Tleety 2016-03-03 09:49:20 +01:00
  • 9d4441852c DefenderWeapon view punch and crosshair travel with return Jace 2016-03-03 03:39:00 +01:00
  • a0f2f2bf5f Merge remote-tracking branch 'origin/master' into Shadows FakeShemp 2016-03-03 03:30:01 +01:00
  • 7ea26d10ee Rewritten. Works as a charm now. FakeShemp 2016-03-03 03:28:21 +01:00
  • 28e9ba1208 Merge branch 'master' into Shadows FakeShemp 2016-03-03 03:00:05 +01:00
  • 362378536e Switching rooms viktorljung 2016-03-03 01:39:12 +01:00
  • 0e8b97dbba Made AmmunitionHUD into TextFieldReader which reads any component field on a parent and updates a Text component with the value! Jace 2016-03-03 01:35:32 +01:00
  • 40c66f76ae A component for tracking score for players. Tleety 2016-03-03 01:28:43 +01:00
  • 13546aa3fc DefenderWeapon and SidearmWeapon Jace 2016-03-01 22:37:19 +01:00
  • 047a119e3f ScoreScreenSystem things Tleety 2016-03-03 01:04:24 +01:00
  • d74ae4e411 Some fixes to the Player and map, added skeleton system for the ScoreScreen Tleety 2016-03-03 00:55:44 +01:00
  • 050ce57e24 Fixed AbilityUI for player and changed so the AbilityCooldown system wont need a child with text, instead just write if it has one. Tleety 2016-03-03 00:32:07 +01:00
  • 8005ca377c Merge branch 'master' into ScoreBoard Tleety 2016-03-02 23:26:33 +01:00
  • f0c2fdead1 Merge pull request #156 from teamfisk/HUD-Timers Tobias Dahl 2016-03-02 22:53:25 +01:00
  • afd0e69a8a Updated Player.xml for multiple weapons Jace 2016-03-01 16:35:54 +01:00
  • e1ca104fc9 Merge remote-tracking branch 'origin/master' into HUD-Timers HUD-Timers Tleety 2016-03-02 22:49:26 +01:00
  • 6f8023b285 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
  • b431a875f7 New weapon behaviours Jace 2016-03-01 13:26:50 +01:00
  • 2cb4a307eb Merge branch 'master' into HUD-Timers Tleety 2016-03-02 22:42:12 +01:00
  • 9c9d1eede6 Components for ScoreScreen Added Tleety 2016-03-02 22:34:03 +01:00
  • 6507efc0db Merge pull request #162 from teamfisk/Boost-icons Jace 2016-03-02 22:28:57 +01:00
  • ebe2d9d4f5 Rebase fixes EditorUsefulness Jace 2016-03-02 22:24:27 +01:00
  • 96a3e68bf4 Merge pull request #160 from teamfisk/EntityFileCaching Tobias Dahl 2016-03-02 22:19:20 +01:00
  • 2d438060dd Player arrow change Tleety 2016-03-02 22:08:23 +01:00
  • a339c61f5b Merge remote-tracking branch 'origin/master' into Boost-icons Tleety 2016-03-02 21:51:52 +01:00
  • 8b81ba9019 Some small fixes, also added new UI elements to Player Tleety 2016-03-02 21:40:20 +01:00
  • 6d2272f62e EditorRenderSystem that draws normally invisible cameras and AABBs Jace 2016-02-02 23:24:02 +01:00
  • 31666f9112 fixup! Unique ids for entity nodes in the editor to prevent weird behaviour when multiple entities have the same name Jace 2016-02-02 21:47:31 +01:00
  • bd49bdb297 Renamed EditorRenderSystem to EditorWidgetRenderSystem to make room for a new EditorRenderSystem that renders normally invisible objects Jace 2016-02-02 21:02:56 +01:00
  • a8173488ca Unique ids for entity nodes in the editor to prevent weird behaviour when multiple entities have the same name Jace 2016-02-02 20:50:46 +01:00
  • 9a668ed7d7 Now here's the real fix for the lag when loading entity files: CONSOLE SPAM EntityFileCaching Jace 2016-03-02 20:16:03 +01:00
  • 7624c6ee0a Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world. Jace 2016-03-02 20:12:59 +01:00
  • 3ef15dcb81 EntityFile now releases EntityXMLFile after processing. Jace 2016-03-02 20:01:18 +01:00
  • 5923d2d7a7 Made SpawnerSystem utilize the new EntityFile for spawning instead Jace 2016-03-02 19:52:34 +01:00
  • 069583e09f Created EntityFile which loads an EntityXMLFile into a temporary world to be merged with another world when you want to create a copy of the entity loaded from disk. This allows us to free EntityXMLFile once it's loaded into an EntityFile. Jace 2016-03-02 19:52:11 +01:00
  • 44b4a597d4 fixup! Created World::Merge which will merge a world into another one Jace 2016-03-02 19:50:52 +01:00
  • 618e96da90 "Fixed" this crash in debug. The attachment vector is sometimes empty! @Tleety Jace 2016-03-02 19:49:54 +01:00
  • fb9914d08a Fixed AMD shader compilation error Jace 2016-03-02 19:48:20 +01:00
  • 0c0f2d7e50 fixup! Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation Jace 2016-03-02 18:56:22 +01:00
  • 26d6546d79 Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation Jace 2016-03-02 18:42:11 +01:00
  • 62c8196ad4 Created World::Merge which will merge a world into another one Jace 2016-03-02 18:38:49 +01:00
  • 7af17049e9 BoostIcons should now track correctly Tleety 2016-03-02 18:13:09 +01:00
  • ffa9d7e607 WIP Jace 2016-03-02 18:06:20 +01:00