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

Commit Graph

  • 07cb025de3 Merge pull request #188 from teamfisk/FriendlyHost/Join Tobias Dahl 2016-03-09 17:49:39 +01:00
  • fdc37a9fe9 Loads the correct menu stiffly 2016-03-09 17:49:04 +01:00
  • 99ccca6273 Merge remote-tracking branch 'origin/master' into FriendlyHost/Join stiffly 2016-03-09 17:38:37 +01:00
  • e9717c68bd Merge pull request #191 from teamfisk/Menu Adam Byléhn 2016-03-09 17:38:18 +01:00
  • d093284569 Rename variable Tleety 2016-03-09 17:37:40 +01:00
  • 85e63acda0 removed standarduniforms Teejoon 2016-03-09 17:36:30 +01:00
  • 7e7d98eaae Merge remote-tracking branch 'origin/master' into Menu Tleety 2016-03-09 17:24:41 +01:00
  • 1104166039 TextureSprite Resource that use GL_NEAREST for sampling aswell as some StartMenu changes Tleety 2016-03-09 17:24:21 +01:00
  • fad93ca5aa Merge remote-tracking branch 'origin/master' into RendererBugFixes Teejoon 2016-03-09 16:54:26 +01:00
  • 91cad561a4 Some more optimization and fixed sorting of render job objects in RenderSystem Teejoon 2016-03-09 16:51:24 +01:00
  • 3ea1177425 Merge pull request #189 from teamfisk/Weapons Jace 2016-03-09 16:17:00 +01:00
  • 7141756992 Merge remote-tracking branch 'origin/Weapons' into Movement viktorljung 2016-03-09 15:59:36 +01:00
  • de125663fd Merge remote-tracking branch 'origin/master' into Movement viktorljung 2016-03-09 15:54:00 +01:00
  • 34e551663f Merge remote-tracking branch 'origin/master' into Weapons Jace 2016-03-09 15:52:13 +01:00
  • fa0b52caec When you disconnect you will delete the world and return to the menu. stiffly 2016-03-09 15:49:42 +01:00
  • 9d368348d5 Updated 3rd person and 1st person animation trees for assault to allow for third person weapon animations Jace 2016-03-09 15:48:57 +01:00
  • 49040e9c4b StartMenu system now sets the main menu camera to active as long as it exists. Tleety 2016-03-09 15:29:42 +01:00
  • a76a04260f StartSystem skeleton and some changes to the StartMenu Tleety 2016-03-09 15:10:54 +01:00
  • 1211888ce1 The world is deleted upon connection to a server. stiffly 2016-03-09 15:10:32 +01:00
  • 877defdfee Merge remote-tracking branch 'origin/master' into FriendlyHost/Join stiffly 2016-03-09 14:47:24 +01:00
  • 6f69b52358 Merge remote-tracking branch 'origin/Menu' into FriendlyHost/Join stiffly 2016-03-09 14:34:41 +01:00
  • 500ebfa08c Menu should now show the correct server IP instead of default. Tleety 2016-03-09 14:34:02 +01:00
  • 09171a1a18 WIP connect from menu stiffly 2016-03-09 14:33:20 +01:00
  • ee4db3c12f Merge pull request #187 from teamfisk/BoneAttachmentFix Jace 2016-03-09 14:32:27 +01:00
  • ddde50b690 Inverse seems to be the same as -w viktorljung 2016-03-09 14:27:50 +01:00
  • 4c184b8f44 Merge pull request #186 from teamfisk/BoneAttachmentFix Jace 2016-03-09 13:51:51 +01:00
  • 555b19c41d BoneAttachments now working perfectly viktorljung 2016-03-09 13:49:28 +01:00
  • 4ae39dcc36 Merge pull request #182 from teamfisk/DamageIndicator William Moberg 2016-03-09 13:26:57 +01:00
  • 67ccb5bee5 Merge remote-tracking branch 'origin/master' into FriendlyHost/Join stiffly 2016-03-09 13:23:31 +01:00
  • 70ec075887 3rd person aim improvements viktorljung 2016-03-09 13:19:56 +01:00
  • ba6d2b758d Add killstreak icon FakeShemp 2016-03-09 12:34:09 +01:00
  • 31ed606ef9 Merge pull request #183 from teamfisk/Menu Adam Byléhn 2016-03-09 12:33:36 +01:00
  • c9c462f695 The console now print some info when you are trying to connect to server Tleety 2016-03-09 12:31:37 +01:00
  • 12dd1d21de Text now handles color, alpha and icon parsing FakeShemp 2016-03-09 12:11:26 +01:00
  • 704242597a Merge remote-tracking branch 'origin/master' into Menu Tleety 2016-03-09 11:49:42 +01:00
  • 00478b4f12 Merge pull request #184 from teamfisk/TeamPickCamera Tobias Dahl 2016-03-09 11:46:30 +01:00
  • f24a5a36b4 Tiny compiler bug fix. TeamPickCamera William Moberg 2016-03-09 11:44:07 +01:00
  • 697da620d3 Merge pull request #179 from teamfisk/TeamPickCamera Tobias Dahl 2016-03-09 11:41:05 +01:00
  • 534d6639e5 Class enum instead of hardcoded ints. William Moberg 2016-03-09 11:35:32 +01:00
  • b782e73556 Falsified DepthSort for SpectatorCamera buttons and CP-HUD elements. William Moberg 2016-03-09 10:56:05 +01:00
  • 6456df8ce1 DamageIndicator is now disabled for Friendly fire DamageIndicator verysecrethero 2016-03-09 10:44:08 +01:00
  • c1f38a71ba Merge remote-tracking branch 'origin/master' into FriendlyHost/Join stiffly 2016-03-09 10:12:57 +01:00
  • d7c30450dc Should now read servername from config. stiffly 2016-03-09 10:08:23 +01:00
  • 30e1c2c247 Merge pull request #178 from teamfisk/NetworkComponent Tobias Dahl 2016-03-09 10:04:40 +01:00
  • 4abe73eae7 Merge remote-tracking branch 'origin/master' into FriendlyHost/Join stiffly 2016-03-09 10:00:44 +01:00
  • e0de91cce3 WIP stiffly 2016-03-08 16:55:35 +01:00
  • 95f68cc888 ConnectRequest event and some other shit Tleety 2016-03-08 22:24:32 +01:00
  • b7d93058b1 Added base work for dity bits in components Jace 2016-03-08 18:26:03 +01:00
  • 6c673db2f4 Merge branch 'TeamPickCamera' of github.com:teamfisk/TacticalZ into TeamPickCamera William Moberg 2016-03-08 19:24:55 +01:00
  • 7bc3c9f7b1 Don't force to spectator camera if player presses pickTeam/Class prematurely. Players team should be remembered after picked, spawn request is not erased anymore. William Moberg 2016-03-08 18:26:17 +01:00
  • 36477abc63 WTF? Dirtybit-WTFDIDIBREAK Jace 2016-03-08 18:26:03 +01:00
  • 3394d65055 Servers now show up in the server list. Tleety 2016-03-08 18:13:21 +01:00
  • ab2b28264f Caching absolute positions, etc. Has not been tested yet. William Moberg 2016-03-08 18:10:36 +01:00
  • 7ee4ea637b Merge remote-tracking branch 'origin/master' into TeamPickCamera verysecrethero 2016-03-08 17:30:22 +01:00
  • 7ced9e6767 Merge branch 'master' of github.com:teamfisk/TacticalZ FakeShemp 2016-03-08 17:25:03 +01:00
  • e5dba6604b Merge pull request #181 from teamfisk/AmmoPickup William Moberg 2016-03-08 17:09:37 +01:00
  • 280de0e984 Merge remote-tracking branch 'origin/FriendlyHost/Join' into Menu Tleety 2016-03-08 17:03:50 +01:00
  • 17e2ebeaa7 Merge remote-tracking branch 'origin/master' into FriendlyHost/Join stiffly 2016-03-08 16:59:24 +01:00
  • 1d8b5abfde Fuck aff Tleety 2016-03-08 16:53:35 +01:00
  • ba9208085b WIP Tleety 2016-03-08 16:52:56 +01:00
  • 52d3cb3ebf GetPlayerAmmo is now a SetPlayerAmmo instead to fix some potential problems if the player has no weapon at all AmmoPickup verysecrethero 2016-03-08 16:33:08 +01:00
  • d51bea798a Merge remote-tracking branch 'origin/Render_Optimization' into RendererBugFixes Teejoon 2016-03-08 16:20:23 +01:00
  • 155d700a44 WIP Teejoon 2016-03-08 16:19:56 +01:00
  • f8ab52c72c WIP Tleety 2016-03-08 16:15:54 +01:00
  • e43a7be7db DamageIndicatorSystem now works for singleplayer again. Friendly fire DamageIndicator is now black color. verysecrethero 2016-03-08 15:55:51 +01:00
  • 5d53fc74cb Merge branch 'Dirtybit' of github.com:teamfisk/TacticalZ into Dirtybit Jace 2016-03-08 15:46:21 +01:00
  • ecc8d998cf Added ComponentInfo::Field_t::Index Jace 2016-03-08 15:46:14 +01:00
  • e3c0fb2178 Added SetDirty function. William Moberg 2016-03-08 15:44:02 +01:00
  • 090bd806ce Added DirtyBit enum to Dirty getter in ComponentWrapper. William Moberg 2016-03-08 15:39:16 +01:00
  • 3828616b60 Made it easier to maintain changes in packet header, prepared for reliable UDP packets. Jocke 2016-03-08 14:44:35 +01:00
  • f934f972e8 Merge remote-tracking branch 'origin/Weapons' into Movement viktorljung 2016-03-08 14:34:21 +01:00
  • 8d1877321a Fixed BoneAttachment offset rotation viktorljung 2016-03-08 14:32:50 +01:00
  • a0ca4df3be Some server list components and entities. Tleety 2016-03-08 13:29:21 +01:00
  • f77a610519 Dash now looking good viktorljung 2016-03-08 13:26:01 +01:00
  • d7f09b1a8f Added clickable buttons to switch to class/team screens, as a better alternative to Comma/Period on the keyboard. William Moberg 2016-03-08 11:59:15 +01:00
  • 68b0175b3d Merge remote-tracking branch 'origin/master' into AmmoPickup verysecrethero 2016-03-08 11:54:57 +01:00
  • 0e0a486c01 AmmoPickupSystem should now be able to give ammo to all classtypes verysecrethero 2016-03-08 11:48:54 +01:00
  • 9cbc582be2 Kinda works like before Jocke 2016-03-08 11:29:47 +01:00
  • 2ba245368b Improved movement animaitons viktorljung 2016-03-08 11:21:40 +01:00
  • 82a7ff2ec3 Merge remote-tracking branch 'origin/master' into RendererBugFixes Teejoon 2016-03-08 11:18:25 +01:00
  • e902110d4b Commiting the files since they didn't get commited Teejoon 2016-03-08 11:16:56 +01:00
  • 13aa476656 Sets most texture to 0 when variable is initialized Teejoon 2016-03-08 11:16:20 +01:00
  • 01f29b6d4e Blur behind buttons/sprites should now be working as intended. Tleety 2016-03-08 11:14:09 +01:00
  • ec3ed1f46f Merge remote-tracking branch 'origin/master' into Kill-streak-sounds stiffly 2016-03-08 10:39:52 +01:00
  • 3436ba6656 Merge pull request #177 from teamfisk/AmmoPickup AndersFixBranch William Moberg 2016-03-08 09:46:36 +01:00
  • 6b7f598c4d WIP Tleety 2016-03-07 23:35:58 +01:00
  • 5c0d9070c7 WIP Tleety 2016-03-07 23:25:06 +01:00
  • 77b9112f55 Since I overwrote the assets I was sent with a now reverted commit, Defender weapon reload animations won't work until it's exported properly Jace 2016-03-07 20:04:22 +01:00
  • 7b0f887332 fixup! fixup! Disabled InputCommand processing while you fiddle with editor UI elements Jace 2016-03-07 19:59:57 +01:00
  • e494f6a495 Merge branch 'master' into Shadows FakeShemp 2016-03-07 19:46:04 +01:00
  • 2049d630e9 Revert "Revert "Shadows"" FakeShemp 2016-03-07 19:45:46 +01:00
  • 3fda25b604 Working first person animations for AssaultWeapon and DefenderWeapon and reload effect for AssaultWeapon Jace 2016-03-07 19:38:49 +01:00
  • 67ce6c5ae6 Added Speed and Delay fields to explosion effect. Jace 2016-03-07 19:38:02 +01:00
  • 1a403b9b88 TextFieldReader now loops through parents if the entity field was empty and the current entity didn't have a component of that type. Jace 2016-03-07 17:55:00 +01:00
  • f923872e51 fixup! Disabled InputCommand processing while you fiddle with editor UI elements Jace 2016-03-07 17:54:01 +01:00
  • abc447b937 Updated snapshot filter to ignore the new animation components Jace 2016-03-07 17:53:47 +01:00
  • 8bcb15a128 Disabled InputCommand processing while you fiddle with editor UI elements Jace 2016-03-07 17:53:32 +01:00
  • b000bb2597 Cleaned up old entities Jace 2016-03-07 17:53:11 +01:00
  • fd994ca93d Deleting texture thats getting rended too. Teejoon 2016-03-07 17:52:47 +01:00
  • fcf87104c3 Replaced test textures for class picking with more proper icons. William Moberg 2016-03-07 17:50:03 +01:00