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

Commit Graph

  • 33627f917c removed debug info. Jocke 2016-03-11 11:01:10 +01:00
  • 0869afd529 Merge pull request #193 from teamfisk/BoxModelCollision verysecrethero 2016-03-11 10:48:25 +01:00
  • 56a13d03fc Merge pull request #197 from teamfisk/SpectatorCamera Adam Byléhn 2016-03-11 10:43:29 +01:00
  • dad18a200f Merge pull request #202 from teamfisk/Trigger Adam Byléhn 2016-03-11 10:38:20 +01:00
  • dab58e09a0 Merge branch 'master' into Menu Tleety 2016-03-11 10:20:25 +01:00
  • cd6967b310 Merge Tleety 2016-03-11 10:20:13 +01:00
  • 3f9866b334 Crudely caching model matrix calculations, work in progress. EmergencyOptimizations Jace 2016-03-11 01:28:22 +01:00
  • 937bf823f3 Merge branch 'master' of github.com:teamfisk/TacticalZ FakeShemp 2016-03-10 21:59:23 +01:00
  • e35b09cc68 Add alpha clipping FakeShemp 2016-03-10 21:59:01 +01:00
  • cc127ad772 Updated defender blendtree viktorljung 2016-03-10 21:31:19 +01:00
  • 1992b6cde1 WIP Defender tracers Weapons Jace 2016-03-10 21:15:27 +01:00
  • d6f0528a87 2 more shaders with DTX5nm calculations Teejoon 2016-03-10 20:03:13 +01:00
  • 0382708b85 Fixed so that we could use DTX5nm as normal map Teejoon 2016-03-10 19:57:01 +01:00
  • d8f9f15d34 Merge branch 'master' into DDS Teejoon 2016-03-10 19:55:25 +01:00
  • c82be79bb8 Functionally working defender weapon Jace 2016-03-10 19:20:33 +01:00
  • 35a8d45fa4 Fixed skinned models not being able to be shielded Jace 2016-03-10 19:20:21 +01:00
  • b172526e62 Merge pull request #199 from teamfisk/CapturePointTake William Moberg 2016-03-10 16:37:53 +01:00
  • 0d2e8c1cbe Merge branch 'master' into Movement viktorljung 2016-03-10 16:31:45 +01:00
  • b3ea26779a Added Unpickable component, which skips the entity in the PickingPass viktorljung 2016-03-10 16:29:13 +01:00
  • ab70aed840 WIP Tleety 2016-03-10 16:15:57 +01:00
  • 551745b0a6 Merge remote-tracking branch 'origin/master' into CapturePointTake CapturePointTake verysecrethero 2016-03-10 16:14:18 +01:00
  • d6e3a47182 Merge branch 'master' into Trigger William Moberg 2016-03-10 16:14:17 +01:00
  • 8b89df0095 Changed to a better validator verysecrethero 2016-03-10 16:09:54 +01:00
  • 59e487f9bb PlayerDefenderBlue Updated blendtree viktorljung 2016-03-10 16:05:46 +01:00
  • 038a706e28 Don't collide against disabled (invisible) models. Triggers uses model vs. box instead of only box vs. box. William Moberg 2016-03-10 16:05:30 +01:00
  • f9808a61f7 Changed sprite text Tleety 2016-03-10 16:02:03 +01:00
  • a8a4b5d2a2 Disconnect on udp Jocke 2016-03-10 15:59:55 +01:00
  • 777f382772 Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2016-03-10 15:48:05 +01:00
  • 78129cf432 Fixed picking depth values after depth buffer was changed to a texture. Jace 2016-03-10 15:47:47 +01:00
  • e734d0c953 Oops. Jace 2016-03-10 15:47:32 +01:00
  • c9fef65c4f Merge pull request #198 from teamfisk/Menu William Moberg 2016-03-10 15:38:06 +01:00
  • 7e6288c597 Some merge fixes and some sprite fixes. Tleety 2016-03-10 15:36:33 +01:00
  • 4322a5d8da Some fixes for sprites Tleety 2016-03-10 15:21:11 +01:00
  • b094b9feca Merge branch 'master' of github.com:teamfisk/TacticalZ FakeShemp 2016-03-10 15:01:27 +01:00
  • 67dfbfff01 Fixed multiply connections Jocke 2016-03-10 14:44:06 +01:00
  • 0a94373f3f The children of the CapturePointModels now also get their visibility on/off. This is done since a capturepoint is actually 2 models and not just 1 verysecrethero 2016-03-10 14:38:20 +01:00
  • 0ee3385e96 WIP now subscribing to the created event in game.cpp. stiffly 2016-03-10 14:34:13 +01:00
  • d7f166b8ae WIP added an event to become a server. changed xml file. stiffly 2016-03-10 14:12:08 +01:00
  • 79d0ef4529 Changed default value of glow intensity Tleety 2016-03-10 14:01:45 +01:00
  • dd63f4a1b4 Fixed FOV being used to calculate projection matrix being degrees when it should be radians, AGAIN. FOV angles are now correct! Jace 2016-03-10 13:51:18 +01:00
  • 50dbbb4ed4 SSAO now send in 0 as Lod level and some optimizations in SSAO and Blur pass. Tleety 2016-03-10 13:47:16 +01:00
  • 329a15e08b Bloom bad edge clamp fixed Tleety 2016-03-10 13:42:33 +01:00
  • 28de31d84d FIX #196: Some variables had not been properly initialized and would cause the game to crash. stiffly 2016-03-10 13:28:38 +01:00
  • e9ef0e7060 Disabled GLERROR macro for release builds Jace 2016-03-10 13:19:26 +01:00
  • 416f55b6ce Merge pull request #196 from teamfisk/RendererBugFixes Jace 2016-03-10 13:11:23 +01:00
  • 0346f81234 Renderer resizing updated to send EResolutionChanged when the resolution is updated so cameras can update their aspect ratio and have a correct FOV. Renderer::SetResolution actually changes the resolution now too. Jace 2016-03-10 13:05:21 +01:00
  • c3255519bf Blur is now looking like real blur Tleety 2016-03-10 13:07:41 +01:00
  • bdcb33d992 Mouse always unlocked on game start and on disconnecting (i.e when menu shows). SpectatorCamera William Moberg 2016-03-10 12:46:06 +01:00
  • a6ef026db5 Fixed on window resize memory leak Teejoon 2016-03-10 12:27:25 +01:00
  • a2244e87ad WIP, trying to get blur to work with mipmaps Tleety 2016-03-10 12:18:06 +01:00
  • 6c072aae45 Merge remote-tracking branch 'origin/master' into ExplosionEffectV2 FakeShemp 2016-03-10 11:49:51 +01:00
  • 68634126e5 Add moar optimization thingies and some xml clarifications FakeShemp 2016-03-10 11:43:11 +01:00
  • c5e0a1566e WIP SpawnerRespawn Jace 2016-03-10 11:04:01 +01:00
  • a0d60160dd Increased size of socket buffer Jocke 2016-03-10 10:58:26 +01:00
  • 15c54d2be6 Merge remote-tracking branch 'origin/master' into SplitSnapshots Jocke 2016-03-10 10:52:51 +01:00
  • f26b24ef6b Merge pull request #195 from teamfisk/AnimationPickingFixes Viktor Ljung 2016-03-10 10:49:05 +01:00
  • b0e9cd3965 Forgot one console spammer AnimationPickingFixes viktorljung 2016-03-10 10:47:58 +01:00
  • e444a86ec5 Merge remote-tracking branch 'origin/master' into Kill-streak-sounds stiffly 2016-03-10 10:36:20 +01:00
  • 5e747f53db Merge pull request #194 from teamfisk/AnimationPickingFixes Adam Byléhn 2016-03-10 10:33:29 +01:00
  • 8a8c375d3a Merge remote-tracking branch 'origin/master' into BoxModelCollision BoxModelCollision William Moberg 2016-03-10 09:57:33 +01:00
  • 167f78951e Made RespawnSystem not spawn while world is paused Jace 2016-03-10 00:08:58 +01:00
  • 4b6d4e581f A "Respawn" componet which automatically triggers a Spawner component when the last respawned entity of that spawner is destroyed Jace 2016-03-09 23:48:41 +01:00
  • 123fbf5633 EEntityDeleted now provides an EntityWrapper instead of just an ID Jace 2016-03-09 23:47:42 +01:00
  • 592edf7dba Sprites can now be rendered with the texture ratio in mind Tleety 2016-03-09 23:31:54 +01:00
  • 4c054d5b8c Promoted SpawnerSystem to Engine Jace 2016-03-09 23:19:29 +01:00
  • 012420b4da Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2016-03-09 23:07:44 +01:00
  • 3a213be679 Picking on animated models fixed viktorljung 2016-03-09 23:06:53 +01:00
  • 50b0a091ec Fixed editor widgets to take scale of the entity into account when they're moved Jace 2016-03-09 22:06:08 +01:00
  • 4e6ff16e58 Shadows for animated models and removed spam in console viktorljung 2016-03-09 22:43:04 +01:00
  • 087facc22e Textures are now able to keep their scale even though the sprite is scaled. Tleety 2016-03-09 22:22:32 +01:00
  • 981dc3467e Baggu fixed again TextColor FakeShemp 2016-03-09 22:11:17 +01:00
  • 727b6ba871 Fixed Transform::AbsolutePosition to take scale into account properly maybe? Jace 2016-03-09 22:04:13 +01:00
  • 42af029a26 fix baggu FakeShemp 2016-03-09 21:25:51 +01:00
  • f9935cad42 Merge branch 'master' into Menu Tleety 2016-03-09 21:07:40 +01:00
  • 37355b1afc Hot fix Jocke 2016-03-09 20:12:08 +01:00
  • e11cdaa662 Removed forced player color on spawn Jace 2016-03-09 20:11:07 +01:00
  • d393f9ade1 Merge pull request #180 from teamfisk/Shadows Tobias Dahl 2016-03-09 19:55:41 +01:00
  • 2e5dfc609a support headshot icons FakeShemp 2016-03-09 19:51:57 +01:00
  • 8936b3d6c3 Probably fixed all the jittering, won't need the jitter guard anymore. William Moberg 2016-03-09 19:45:26 +01:00
  • ad49af2f8c Merge remote-tracking branch 'origin/master' into SplitSnapshots Jocke 2016-03-09 19:43:48 +01:00
  • 5a7034dfcd popped the right amount of the header Jocke 2016-03-09 19:43:18 +01:00
  • e25c9ee690 Merge remote-tracking branch 'origin/master' into Shadows Shadows FakeShemp 2016-03-09 19:38:55 +01:00
  • 9721cb6a7d Merge remote-tracking branch 'origin/master' into SplitSnapshots Jocke 2016-03-09 19:14:10 +01:00
  • 90b2c70215 Some sprite fixes Tleety 2016-03-09 19:12:06 +01:00
  • fce6e90f3c First person assault weapon idle animation now correct Jace 2016-03-09 19:07:02 +01:00
  • 07d85bacf6 Added file extension to CP_Rocky2 & moved spawn points on the Y axis. antc13 2016-03-09 18:57:45 +01:00
  • 15c1b238ef Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-03-09 18:46:43 +01:00
  • b8839551a4 Created the map CP_Rocky2 but beware, it's still WIP. antc13 2016-03-09 18:46:26 +01:00
  • c36c7d1ea6 Merge remote-tracking branch 'origin/master' into SplitSnapshots Jocke 2016-03-09 18:41:01 +01:00
  • ce58fac6ba Merge pull request #192 from teamfisk/Movement Jace 2016-03-09 18:37:56 +01:00
  • 1bfd0cce5e Idel viktorljung 2016-03-09 18:36:53 +01:00
  • 60ff53112e Merge remote-tracking branch 'origin/master' into Movement viktorljung 2016-03-09 18:27:36 +01:00
  • d42d886dcc 3rd person animations synced with 1st person animations viktorljung 2016-03-09 18:27:09 +01:00
  • 3209e36176 We can now send more data with UDP than previously, the splitting seems to work fine but receiving has some problems. Jocke 2016-03-09 18:26:33 +01:00
  • 8a3564ad49 Merge remote-tracking branch 'origin/master' into BoxModelCollision William Moberg 2016-03-09 18:03:39 +01:00
  • 1f14087734 Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2016-03-09 18:02:11 +01:00
  • 0b58f32f32 Fixed third person animations over network Jace 2016-03-09 18:01:32 +01:00
  • 48d9463bd3 Merge pull request #190 from teamfisk/RendererBugFixes Tobias Dahl 2016-03-09 18:01:02 +01:00
  • 9581e9ac84 Don't set the player to previous position when uncrouching. William Moberg 2016-03-09 17:51:26 +01:00
  • 974d9101bd Merge remote-tracking branch 'origin/master' into RendererBugFixes Teejoon 2016-03-09 17:50:42 +01:00