Commit Graph

  • 7ebc910867 Updated submodule remotes to something more manageable and accessible. master Final Jace 2017-01-04 14:46:14 +01:00
  • 7fc83d1471 Live texturing LiveTexturing maqu14 2016-03-18 10:14:02 +01:00
  • 1354bd5d91 Merge branch 'master' of github.com:teamfisk/TacticalZ FakeShemp 2016-03-14 20:07:04 +01:00
  • 3eb1cf6c9f Shadows tweaked to allow point lights to light up shadows. FakeShemp 2016-03-14 20:06:48 +01:00
  • cb94f6aecd AnimationDemo AnimationBlendDemo viktorljung 2016-03-14 20:03:52 +01:00
  • bdbf864934 spawning 1 shield on server and one on client ShieldFix viktorljung 2016-03-14 16:46:03 +01:00
  • 494746ad8b Merge remote-tracking branch 'origin/Recording' into Recording Recording Jace 2016-03-14 16:33:53 +01:00
  • f269caafed spawning shield on server and client viktorljung 2016-03-14 16:02:20 +01:00
  • 01e0e41122 Merge remote-tracking branch 'origin/master' into AndersTest AndersTest verysecrethero 2016-03-14 10:31:03 +01:00
  • 18ea938b56 Added start menu shortcut to starting a server Anderstestmaster Jace 2016-03-14 09:59:54 +01:00
  • 43779c0738 Merge remote-tracking branch 'origin/master' into DDS DDS Teejoon 2016-03-14 09:32:46 +01:00
  • 27361225e0 Some files didn't get staged... Teejoon 2016-03-14 09:31:45 +01:00
  • 1d170f28e1 Making shadows take less space when not in use Teejoon 2016-03-14 09:30:40 +01:00
  • 6c14b2a97e Updated start menu to load same map as game to save video memory Jace 2016-03-14 09:26:16 +01:00
  • 54eb3727b0 Fixed respawn Jace 2016-03-14 09:26:04 +01:00
  • 39e5f7b2dc Actually DDS Jace 2016-03-14 09:21:07 +01:00
  • cce43ebc1a DDS and shit Jace 2016-03-14 09:08:14 +01:00
  • 2a1f6cd9cf Updated installer Jace 2016-03-14 08:38:08 +01:00
  • 39da2bff27 README Jace 2016-03-14 08:38:00 +01:00
  • b886d9146b WIP STUFF Jace 2016-03-14 08:33:33 +01:00
  • 28de3c716c Hopefully everything is working with dds and PNG textures Teejoon 2016-03-14 08:16:35 +01:00
  • 57715d5846 Merge branch 'master' into Recording Jace 2016-03-14 06:13:23 +01:00
  • 003f5b14a5 Merge remote-tracking branch 'origin/master' into DDS Teejoon 2016-03-14 06:10:30 +01:00
  • a3f215831d Fixed DDS after merge Teejoon 2016-03-14 06:09:06 +01:00
  • fb3842ba5b Indentation. William Moberg 2016-03-14 06:05:11 +01:00
  • 6daaccb9ed Merge branch 'Recording' of github.com:teamfisk/TacticalZ into Recording William Moberg 2016-03-14 06:02:47 +01:00
  • 0cd161184e Smoother movement for editor camera. William Moberg 2016-03-14 06:00:12 +01:00
  • 87b983ec6f Stuff Jace 2016-03-14 05:56:09 +01:00
  • 16ef09b20b Merge pull request #222 from teamfisk/DeathAnimation Joachim Pettersson 2016-03-14 05:48:07 +01:00
  • fe87aa8e90 Death effect re-added. Hands get weird when explosion is triggered. DeathAnimation Jocke 2016-03-14 04:45:01 +01:00
  • 592f33653e Better shadows for recording Jace 2016-03-14 04:44:53 +01:00
  • b9b5f4bff7 Removed healing effect of defender boost viktorljung 2016-03-14 04:37:43 +01:00
  • 5db1bddd08 Merge branch 'master' of github.com:teamfisk/TacticalZ viktorljung 2016-03-14 04:31:45 +01:00
  • b366a8c149 Red players fixes viktorljung 2016-03-14 04:31:38 +01:00
  • 483091a1de Merge pull request #137 from teamfisk/Importer Adam Byléhn 2016-03-14 04:26:50 +01:00
  • 0e9be1d650 Merge branch 'master' of github.com:teamfisk/TacticalZ Tleety 2016-03-14 04:25:34 +01:00
  • 5679a88ddb Quit working Tleety 2016-03-14 04:25:20 +01:00
  • 289bde0395 Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2016-03-14 04:25:19 +01:00
  • a3fef7bcd1 Better CP_Valhalla lighting Jace 2016-03-14 04:24:40 +01:00
  • c74a4e375e Better CP_Valhalla lighting Jace 2016-03-14 04:24:40 +01:00
  • 04fbd0d517 Merge branch 'master' of github.com:teamfisk/TacticalZ viktorljung 2016-03-14 04:12:02 +01:00
  • 9308e60932 Red players viktorljung 2016-03-14 04:11:46 +01:00
  • 78a383b03c Merge branch 'master' into Recording Jace 2016-03-14 04:04:20 +01:00
  • 24de85b476 Editor no longer resets camera Jace 2016-03-14 04:02:05 +01:00
  • fc97c4e8ea Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2016-03-14 04:01:40 +01:00
  • e3767996a1 Added DEBUG flags to all debug imgui stuff Jace 2016-03-14 04:01:04 +01:00
  • 809d164eba Merge pull request #221 from teamfisk/PerfectSoundForRelease William Moberg 2016-03-14 03:54:35 +01:00
  • 5879cb0de4 Merge pull request #219 from teamfisk/FixAssaultWeaponReload Tobias Dahl 2016-03-14 03:48:59 +01:00
  • 832a901bf6 Merge pull request #220 from teamfisk/Movement Tobias Dahl 2016-03-14 03:48:47 +01:00
  • 407149fbb0 Merge branch 'master' into Importer Importer William Moberg 2016-03-14 03:23:08 +01:00
  • 4c52f55bf0 Any collision meshes we have should be working, and RawModels should be released after being loaded. William Moberg 2016-03-14 03:20:36 +01:00
  • 8449818cb7 Merge branch 'Movement' viktorljung 2016-03-14 03:13:48 +01:00
  • 94a10c3a8f New polished map maqu14 2016-03-14 03:07:58 +01:00
  • cbb2eee003 Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2016-03-14 02:53:18 +01:00
  • f6d85c86c4 Added new team pick Jace 2016-03-14 02:52:02 +01:00
  • 659dfed088 Commit reminder Teejoon 2016-03-14 02:52:33 +01:00
  • 8151e9a9a4 Merge branch 'master' into DDS Teejoon 2016-03-14 02:51:45 +01:00
  • 8a24a16232 Merge branch 'master' of github.com:teamfisk/TacticalZ maqu14 2016-03-14 02:51:09 +01:00
  • d850e116fb New map, Some new assets maqu14 2016-03-14 02:50:24 +01:00
  • a4c35e5908 Lower Glow intensity on players Teejoon 2016-03-14 02:38:26 +01:00
  • ff881e1f78 Merge branch 'master' of https://github.com/teamfisk/TacticalZ Teejoon 2016-03-14 02:16:07 +01:00
  • eb2e79e4cb Players now got lights on them Teejoon 2016-03-14 02:15:56 +01:00
  • f632b45c9b Merge branch 'MemoryOptimization' into Importer William Moberg 2016-03-14 02:06:53 +01:00
  • 788d80f721 Merge branch 'master' of github.com:teamfisk/TacticalZ Tleety 2016-03-14 01:59:41 +01:00
  • 0b485163c9 Changes to menu Tleety 2016-03-14 01:59:33 +01:00
  • e527badab4 Executable name updated to "Axyz" Jace 2016-03-14 01:53:20 +01:00
  • 8cef422ea7 Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease PerfectSoundForRelease stiffly 2016-03-14 01:51:51 +01:00
  • 54a03ddc0f Hurt sound only played for local player. stiffly 2016-03-14 01:49:37 +01:00
  • a65d8c86d1 3rd person reload effect Movement viktorljung 2016-03-14 01:48:48 +01:00
  • d492b54687 Added executable icon to CMakeLists Jace 2016-03-14 01:42:14 +01:00
  • c1395355c6 Removed comment stiffly 2016-03-14 01:36:11 +01:00
  • f62f8d53db Merge branch 'Setup' Jace 2016-03-14 01:30:49 +01:00
  • 51c7e92fce Fixed redist install Jace 2016-03-14 00:52:08 +01:00
  • 0764c9bab2 Merge remote-tracking branch 'origin/master' into Movement viktorljung 2016-03-14 01:20:20 +01:00
  • 7e6830af35 Merge branch 'master' into Importer William Moberg 2016-03-14 01:09:18 +01:00
  • c61d33ebd9 NewScorebord Teejoon 2016-03-14 01:08:22 +01:00
  • 1b1963e6d2 Reload for assault is only done once now. FixAssaultWeaponReload Jocke 2016-03-14 01:01:35 +01:00
  • dea57b4872 Fixes after merge. William Moberg 2016-03-14 01:00:58 +01:00
  • 3994c0f7ad Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease stiffly 2016-03-14 00:59:32 +01:00
  • 1345889e62 The win sound plays on win screen stiffly 2016-03-14 00:58:53 +01:00
  • 50abeda99a Merge pull request #218 from teamfisk/DashEffect Adam Byléhn 2016-03-14 00:58:00 +01:00
  • fe6f294986 Moved installer script to subdir Jace 2016-03-14 00:52:03 +01:00
  • 424dffd1e0 removed shadows on 1st person hands and weapons viktorljung 2016-03-14 00:47:21 +01:00
  • 33ed59fc3a Added files for setup creation Jace 2016-03-14 00:45:09 +01:00
  • 562afac9d1 Merge branch 'master' into Importer William Moberg 2016-03-14 00:42:07 +01:00
  • d1c11f20f2 Merge remote-tracking branch 'origin/master' into Movement viktorljung 2016-03-14 00:39:16 +01:00
  • 1bba40449f Tracers done viktorljung 2016-03-14 00:38:36 +01:00
  • fd482dd670 Axyz logo in menu Tleety 2016-03-14 00:37:29 +01:00
  • f5343251c5 fixed for real now? viktorljung 2016-03-14 00:28:30 +01:00
  • c493ebca8e Viewpunch for sidearm and defender Tleety 2016-03-14 00:23:51 +01:00
  • ef9a449077 Merge branch 'master' into DashEffect William Moberg 2016-03-14 00:07:45 +01:00
  • 5207248a49 3rd person tracers fixed viktorljung 2016-03-14 00:04:51 +01:00
  • 12d0c68fbf Weapon should fade on dash effect afterimage. William Moberg 2016-03-13 23:57:47 +01:00
  • 1bf65d896a Sidearm tracer fixed viktorljung 2016-03-13 23:42:21 +01:00
  • 7855cf03d2 The Endscreen now works over the network. stiffly 2016-03-13 23:33:10 +01:00
  • b89f68ae2f Merge branch 'master' of github.com:teamfisk/TacticalZ Tleety 2016-03-13 23:30:26 +01:00
  • 36185b43ef Killfeed in overwatch camera Tleety 2016-03-13 23:30:17 +01:00
  • 4adf7dc507 Assault tracer fixed viktorljung 2016-03-13 23:29:50 +01:00
  • e2686abb16 Merge branch 'master' into DashEffect William Moberg 2016-03-13 23:25:38 +01:00
  • be91fc5005 WIP dash effect fade weapon 2. William Moberg 2016-03-13 23:23:36 +01:00