Commit Graph

  • 0084224e18 WIP, dash effect fade weapon. William Moberg 2016-03-13 23:23:05 +01:00
  • 73bcc6e382 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement viktorljung 2016-03-13 23:12:59 +01:00
  • f393a22011 defender tracer fixed viktorljung 2016-03-13 23:12:45 +01:00
  • 9d2ce5af8a Player is now spawned as the correct class that they picked. Jace 2016-03-13 23:05:52 +01:00
  • e4145cf292 Fixed dash effect to be supported with the new animations using Fade components. William Moberg 2016-03-13 22:49:24 +01:00
  • 03dab9ca9a Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease stiffly 2016-03-13 22:33:23 +01:00
  • fc7f57fd5d Merge remote-tracking branch 'origin/master' Jace 2016-03-13 22:27:17 +01:00
  • c20830572c Merge branch 'master' of https://github.com/teamfisk/TacticalZ Ayumiwii 2016-03-13 22:24:59 +01:00
  • 00d77607b4 new scoreboard Ayumiwii 2016-03-13 22:24:27 +01:00
  • 1a120ef345 Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease stiffly 2016-03-13 22:22:41 +01:00
  • a715f7fe86 Merge branch 'master' into Movement Jace 2016-03-13 22:22:36 +01:00
  • 0d823421d8 Added win sound file stiffly 2016-03-13 22:22:19 +01:00
  • d587c9a692 Fixed first person strafe animation viktorljung 2016-03-13 22:17:55 +01:00
  • 7d32909122 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement viktorljung 2016-03-13 22:14:11 +01:00
  • ce2fcd9109 Now it works Tleety 2016-03-13 22:13:37 +01:00
  • 77bb7a0f5c Merge pull request #200 from teamfisk/UnpickableComponent Jace 2016-03-13 22:09:23 +01:00
  • 78c7d777e3 Made player models in class select unpickable Jace 2016-03-13 22:09:12 +01:00
  • 98bd447084 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement viktorljung 2016-03-13 22:02:45 +01:00
  • fd50ea3a12 Defender friendly boost hud viktorljung 2016-03-13 22:02:37 +01:00
  • 83ae87594f Fixed maxhealth probably Tleety 2016-03-13 22:00:48 +01:00
  • 53dd96d44d Merge branch 'master' into UnpickableComponent Jace 2016-03-13 22:00:10 +01:00
  • d9b47ddb62 Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2016-03-13 21:55:03 +01:00
  • bc3e699ddb Bumping master to latest assets Jace 2016-03-13 21:54:50 +01:00
  • 412c92aa7f Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-03-13 21:51:37 +01:00
  • b76bc74c4b Changed glow intensity on some grid walls. antc13 2016-03-13 21:51:24 +01:00
  • 8c48e96ad1 Merge pull request #211 from teamfisk/MSAA Tobias Dahl 2016-03-13 21:47:43 +01:00
  • fe9c5bd686 Merge pull request #217 from teamfisk/revert-216-ShadowOptimization Tobias Dahl 2016-03-13 21:36:12 +01:00
  • 7fa634ef7c Revert "Shadow will actually shut itself off and delete itself now" revert-216-ShadowOptimization Tobias Dahl 2016-03-13 21:35:57 +01:00
  • 080f5ac856 Merge pull request #216 from teamfisk/ShadowOptimization Tobias Dahl 2016-03-13 21:32:42 +01:00
  • 4ecbef59bf Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2016-03-13 21:29:59 +01:00
  • 8a1217e8b5 Hoodwinked GLFW into creating a fullscreen windowed window by initializing it one pixel higher than the resolution height Jace 2016-03-13 21:29:39 +01:00
  • f59a9e1d2b Merge remote-tracking branch 'origin/master' into MSAA MSAA Teejoon 2016-03-13 21:28:38 +01:00
  • 5796d07b56 PerformanceTimer will no longer run while in release Teejoon 2016-03-13 21:25:32 +01:00
  • 8e150da7ff Use CommonFunctions::DeleteTexture() instead ShadowOptimization FakeShemp 2016-03-13 21:25:04 +01:00
  • 148d60f8f8 hp really fixed? viktorljung 2016-03-13 21:24:27 +01:00
  • 066ca6075d hp fixed? viktorljung 2016-03-13 21:19:21 +01:00
  • 93f4384da6 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement viktorljung 2016-03-13 21:10:39 +01:00
  • 3a0cff7a83 boost check for defender viktorljung 2016-03-13 21:10:22 +01:00
  • c790b952fb Merge pull request #214 from teamfisk/PerfectSoundForRelease William Moberg 2016-03-13 21:01:21 +01:00
  • 27443d4e08 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement Tleety 2016-03-13 21:01:15 +01:00
  • 20e48eeb08 Killfeed should work now. Tleety 2016-03-13 21:01:04 +01:00
  • e929ecab50 fix??? viktorljung 2016-03-13 20:58:53 +01:00
  • be3d75a5cf Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-03-13 20:48:23 +01:00
  • b3c935c7cc Fixed rotation/translation on some objects on CP_Rocky2. They somehow got weird rotation values. antc13 2016-03-13 20:48:05 +01:00
  • ee8d7574b2 dash fix? viktorljung 2016-03-13 20:46:59 +01:00
  • 1da3ec3c74 ammo share fix? viktorljung 2016-03-13 20:32:08 +01:00
  • f05b09ca7a Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2016-03-13 19:54:22 +01:00
  • e76740d72b Point lights child of a camera no longer visible to other cameras Jace 2016-03-13 19:53:34 +01:00
  • d3927de7cc Super fancy new class pick, don't overwrite plz Jace 2016-03-13 19:51:01 +01:00
  • 5aaefc6e53 Animation optimization Teejoon 2016-03-13 19:01:30 +01:00
  • 6bfed76e06 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement viktorljung 2016-03-13 18:56:04 +01:00
  • 389d27973f Assault boost check viktorljung 2016-03-13 18:55:45 +01:00
  • fe090504cf Now listens to SetCamera event and the background music should be working properly. stiffly 2016-03-13 17:35:05 +01:00
  • fc5ad2d380 Small fix Tleety 2016-03-13 17:33:12 +01:00
  • a9d5c5d9d2 Glow is looking good :) Teejoon 2016-03-13 17:15:36 +01:00
  • 0d287ad5d1 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement viktorljung 2016-03-13 16:45:57 +01:00
  • 3cee4e4248 defender ray fixes viktorljung 2016-03-13 16:42:07 +01:00
  • 5f11d1e066 fix Teejoon 2016-03-13 16:38:50 +01:00
  • 672d6f884d Merge pull request #215 from teamfisk/RestartMap Adam Byléhn 2016-03-13 16:33:51 +01:00
  • 17007a2a41 fix fix viktorljung 2016-03-13 16:28:39 +01:00
  • 5ea0f04b20 Added pop up for client when server timeouts. RestartMap Jocke 2016-03-13 16:21:55 +01:00
  • 9b5e4c10fd Shadow will actually shut itself off and delete itself now FakeShemp 2016-03-13 16:19:17 +01:00
  • 041050ab2f Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement Tleety 2016-03-13 16:15:26 +01:00
  • 9f752ad3e9 Fadesystem, entities, weapon muzzles should now look good. reload for secondary Tleety 2016-03-13 16:15:06 +01:00
  • 04288e5243 Merge fixes viktorljung 2016-03-13 16:14:13 +01:00
  • fb400bb743 Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease stiffly 2016-03-13 15:37:14 +01:00
  • aa2475dfd6 Stops bgm when the game is reset. stiffly 2016-03-13 15:36:56 +01:00
  • 36c4837813 Merge pull request #213 from teamfisk/Dirtybit Jace 2016-03-13 15:29:45 +01:00
  • 741ed01930 Merge remote-tracking branch 'origin/master' into MSAA Teejoon 2016-03-13 15:28:00 +01:00
  • 2fa3637018 Transform.cpp was deleted since stuff was moved to TransformSystem, takes care of linker warnings. Dirtybit William Moberg 2016-03-13 15:26:35 +01:00
  • 52e5e2527a Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-03-13 15:21:44 +01:00
  • 36253a8afd Made minor changes to light positions on CP_Rocky2. Replaced a model & changed glow value on some walls. antc13 2016-03-13 15:21:29 +01:00
  • 44f46cda8d Merge remote-tracking branch 'origin/master' into Movement viktorljung 2016-03-13 15:17:15 +01:00
  • 5c343cb254 Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease stiffly 2016-03-13 15:10:52 +01:00
  • b73595eed0 Merge pull request #210 from teamfisk/RestartMap Adam Byléhn 2016-03-13 15:10:01 +01:00
  • 7d899a989c Started working on boost HUD thingy viktorljung 2016-03-13 15:09:50 +01:00
  • bb3a8dba6a Merge branch 'master' into MSAA Teejoon 2016-03-13 15:06:02 +01:00
  • f9e640ffc6 Added borders to capture points so that you can see if your inside of outside when not looking down Teejoon 2016-03-13 14:59:57 +01:00
  • f2c7a9f27a Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease stiffly 2016-03-13 14:56:00 +01:00
  • 0f4f32188c assault weapon now reloading correctly viktorljung 2016-03-13 14:55:29 +01:00
  • 0516794db6 Separating RawModel from Model MemoryOptimization Jace 2016-03-13 14:38:22 +01:00
  • ac20e41a5d Fixed merge conflicts. Scoreboard updates team when a team is picked. Fixed some code standard violations and misspellings. William Moberg 2016-03-13 14:23:56 +01:00
  • 0963f61976 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement viktorljung 2016-03-13 13:41:39 +01:00
  • bfb7a4139d Tweaking viktorljung 2016-03-13 13:41:28 +01:00
  • 4f99f6ef74 Merge branch 'master' into RestartMap William Moberg 2016-03-13 13:37:51 +01:00
  • d0a083a1e3 Fixed rotation/translation on some objects on CP_Rocky2. antc13 2016-03-13 13:13:14 +01:00
  • d5f06fa8c2 Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-03-13 12:20:36 +01:00
  • 8bb8ebbea3 Fixed Splatmap Export antc13 2016-03-13 12:20:25 +01:00
  • 60c6aa2486 Defender first person tracers done viktorljung 2016-03-13 02:35:02 +01:00
  • 8d809f30f7 Muzzleflash now very nice Tleety 2016-03-13 02:25:11 +01:00
  • bbe61f300c Fade in/out should now work with models and sprites Tleety 2016-03-13 02:03:49 +01:00
  • ec7ab417e6 Added so that mipmaps can have diferant formats. Bloom also uses RGB8 on all texture now Teejoon 2016-03-13 01:47:37 +01:00
  • 4bd2e7995a fixup! Cheeki breeki Jace 2016-03-13 01:32:29 +01:00
  • 799fd31844 Merge pull request #212 from teamfisk/Dirtybit Jace 2016-03-13 01:26:54 +01:00
  • 45bfc374de Cheeki breeki Jace 2016-03-13 01:25:13 +01:00
  • 13f44c2086 Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement Tleety 2016-03-13 01:24:01 +01:00
  • f6a8534c15 New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation Tleety 2016-03-13 01:23:51 +01:00
  • 95f9065037 Merge branch 'master' into Dirtybit Jace 2016-03-13 00:58:45 +01:00
  • 993e56ec59 Disabled final model matrix caching for now, since it doesn't seem to work in all cases. (CP_Rocky2 pickup platforms and ceiling doens't get updated for some reason?!?) Jace 2016-03-13 00:57:54 +01:00
  • a1fda82d3a Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself Jace 2016-03-13 00:55:53 +01:00