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

Commit Graph

  • 20d46f63c8 The main menu music would not start again when you returned to the main menu. stiffly 2016-03-13 00:16:55 +01:00
  • f6113b9d9c EEntityDeleted now provides an EntityWrapper instead of just an ID Jace 2016-03-09 23:47:42 +01:00
  • 2e89227061 Merge remote-tracking branch 'origin/master' into MSAA Teejoon 2016-03-13 00:09:07 +01:00
  • 958850903a Moved ViewSpacePosition calculation from fragmenst shader to vertexshader Teejoon 2016-03-13 00:08:49 +01:00
  • 7ea90bede7 Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2016-03-12 23:49:44 +01:00
  • 2bfbd72189 EntityWrapper::Clone should no longer cause freezes Jace 2016-03-12 23:44:28 +01:00
  • 1e7f6941ba Merge pull request #208 from teamfisk/Kill-streak-sounds Jace 2016-03-12 23:06:57 +01:00
  • 5146d21173 MSAA is now working Teejoon 2016-03-12 22:22:53 +01:00
  • 8c90c39680 Merge pull request #209 from teamfisk/MemoryOptimization William Moberg 2016-03-12 21:59:51 +01:00
  • b7d88808e2 Redid timers. Jocke 2016-03-12 21:38:46 +01:00
  • f8f536802f Time for ending the game is now in CapturePointGameMode component. The timer i counted down to 0 and then the map is "Reset". Jocke 2016-03-12 20:28:48 +01:00
  • 91bad517d3 AbsolutePosition should be calculating correctly now, third time. William Moberg 2016-03-12 19:59:37 +01:00
  • 60df30fa59 Scoreboard is now works. Jocke 2016-03-12 19:36:12 +01:00
  • c0fc36845f Defender ability HUD fixed viktorljung 2016-03-12 18:43:04 +01:00
  • 51b8846b3a Ammo sharing done viktorljung 2016-03-12 18:29:49 +01:00
  • ba93ebbe88 Go away crap maps. Jace 2016-03-12 18:21:36 +01:00
  • 70b0ca8776 Merge remote-tracking branch 'origin/master' into MSAA Teejoon 2016-03-12 18:04:26 +01:00
  • 90d848e8d9 Made texture getters from draw finalpass from const Teejoon 2016-03-12 18:04:10 +01:00
  • a3b3351e55 Merge branch 'master' into Dirtybit William Moberg 2016-03-12 17:59:50 +01:00
  • ce0d3b9fbe Fixed texture freeing. Destructor was never called because base destructors weren't virtual. Jace 2016-03-12 17:45:43 +01:00
  • 674604d0df Merge branch 'Dirtybit' of github.com:teamfisk/TacticalZ into Dirtybit William Moberg 2016-03-12 17:51:55 +01:00
  • 8e9ddc7b9d playerJump is only done for local player. Kill-streak-sounds stiffly 2016-03-12 17:51:06 +01:00
  • 36b84f7cc3 Fixed so calculating absolute positions, etc. works. Sets the field of all children to dirty if a transform field is altered. Will also set Position to dirty if Scale or Orientation is altered. William Moberg 2016-03-12 17:51:03 +01:00
  • c544f349fd The logic for removing the world is working but when we send the map again the clients memory usage goes crazy. Jocke 2016-03-12 17:49:50 +01:00
  • dfc30f4693 Boost fixes? viktorljung 2016-03-12 17:39:50 +01:00
  • 944d10f4bb Some network fixes with sidearm viktorljung 2016-03-12 17:34:32 +01:00
  • f7363eeea4 Boost icon fix Tleety 2016-03-12 17:30:28 +01:00
  • beee2db5fb Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-03-12 17:08:21 +01:00
  • 1bc4b89a53 Added new models with textures to the map. Every model on the map should now be using a texture. antc13 2016-03-12 17:08:07 +01:00
  • d51ea3cabd Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement Tleety 2016-03-12 17:04:00 +01:00
  • 548efeb11e EndScreen should now show when a team win Tleety 2016-03-12 17:03:50 +01:00
  • 4ba011a098 Ammosharing over network test WIP viktorljung 2016-03-12 17:01:46 +01:00
  • 01cb3afb4b Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement viktorljung 2016-03-12 15:48:41 +01:00
  • 0b26f23188 3rd person animations idle bug fixed viktorljung 2016-03-12 15:47:19 +01:00
  • 8c2a665ccb Some Entities for endscreen and some basic logic in the EndScreenSystem Tleety 2016-03-12 15:45:07 +01:00
  • cc10e5500b 2x jump now only plays for local player stiffly 2016-03-12 15:31:44 +01:00
  • 068e151741 Merge pull request #173 from teamfisk/ExplosionEffectV2 Jace 2016-03-12 15:25:12 +01:00
  • e7a3793486 Merge pull request #207 from teamfisk/SomeTests Jace 2016-03-12 15:23:29 +01:00
  • 9bac141a6b WIP fixing pull request stiffly 2016-03-12 15:07:10 +01:00
  • 4334ea067e System skeleton Tleety 2016-03-12 14:44:03 +01:00
  • 8e266984f4 Player HUD should now be ok, color of health still shit tho Tleety 2016-03-12 14:37:26 +01:00
  • 0c1a2d3160 WIP Jocke 2016-03-12 14:31:15 +01:00
  • eb5fcd6d19 Rendering back to normal Jace 2016-03-12 14:28:17 +01:00
  • 9942747d41 WIP pull request fixes stiffly 2016-03-12 14:26:09 +01:00
  • 24bb05ec67 Editor should now set dirty flag when component field changes Jace 2016-03-12 05:17:56 +01:00
  • df7b4faf24 Now caching resulting absolute model matrices as well Jace 2016-03-12 04:10:14 +01:00
  • 01db8e0615 Merge remote-tracking branch 'origin/master' into Dirtybit Jace 2016-03-12 03:37:29 +01:00
  • 5baac926aa Perfectly working abs pos caching using dirty flags! :D Jace 2016-03-12 03:29:41 +01:00
  • 060585a388 Aim fixed for all weapons viktorljung 2016-03-12 02:39:06 +01:00
  • ee5c13d463 Merge branch 'Dirtybit-imon' into Dirtybit Jace 2016-03-12 01:32:09 +01:00
  • 671079764e Merge branch 'Dirtybit' of github.com:teamfisk/TacticalZ into Dirtybit Jace 2016-03-12 01:26:56 +01:00
  • 9b98bbbea8 Fields are now set to dirty when they're changed! Dirtybit-imon Jace 2016-03-12 01:26:03 +01:00
  • 80649ce51d Updated the ENTIRE CODEBASE TO MATCH Jace 2016-03-12 00:38:33 +01:00
  • a4b0b108d4 Created a wrapper for field types that is able to detect changes to set dirty flags in the future Jace 2016-03-12 00:38:26 +01:00
  • 2a209c5d8e AmmoSharing beta viktorljung 2016-03-11 23:58:26 +01:00
  • 28d576bfc0 Now the bgm should loop again. stiffly 2016-03-11 21:04:33 +01:00
  • 66d0f9fa47 Added menu music stiffly 2016-03-11 19:17:43 +01:00
  • dc09ba9158 Resolution should now use a dropdown Tleety 2016-03-11 20:02:25 +01:00
  • e0a6b09d36 Defender early alpha viktorljung 2016-03-11 19:16:34 +01:00
  • 1ad087dc75 MSAA mostly working. Only merging the MS render buffer to a single texture so that others could use the AA texture easly Teejoon 2016-03-11 19:05:34 +01:00
  • 157a54e845 Merge remote-tracking branch 'origin/master' into Kill-streak-sounds stiffly 2016-03-11 18:19:22 +01:00
  • 7759af2c5a Log remove Tleety 2016-03-11 15:52:47 +01:00
  • ac096bbf77 Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-03-11 15:46:39 +01:00
  • 81634578d9 Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points. antc13 2016-03-11 15:43:20 +01:00
  • 2f61171d16 Merge pull request #185 from teamfisk/TextColor Tobias Dahl 2016-03-11 15:25:06 +01:00
  • aa16a15693 Merge pull request #205 from teamfisk/Menu Tobias Dahl 2016-03-11 15:23:13 +01:00
  • 26337ff243 Merge remote-tracking branch 'origin/master' into Menu Menu Tleety 2016-03-11 15:07:52 +01:00
  • 7bdb0d410f Merge branch 'master' of github.com:teamfisk/TacticalZ FakeShemp 2016-03-11 15:04:52 +01:00
  • 172fb8dfc2 MuzzleFlash entities FakeShemp 2016-03-11 15:04:44 +01:00
  • 0ca627eb8b Merge remote-tracking branch 'origin/master' into Menu Tleety 2016-03-11 14:57:59 +01:00
  • 530c0fd9b0 Merge pull request #204 from teamfisk/RendererBugFixes Tobias Dahl 2016-03-11 14:57:36 +01:00
  • 4df936ca70 imon's fix to rule them all ExplosionEffectV2 FakeShemp 2016-03-11 14:57:02 +01:00
  • f036817c0c Merge pull request #203 from teamfisk/SplitSnapshots William Moberg 2016-03-11 14:35:18 +01:00
  • e45d0e8232 fix. SplitSnapshots Jocke 2016-03-11 14:32:55 +01:00
  • 8ebf818c19 Merge pull request #206 from teamfisk/CapturePointFixBranch William Moberg 2016-03-11 14:26:45 +01:00
  • 62d1cb9a69 fixed request. Jocke 2016-03-11 14:24:59 +01:00
  • edb305b307 Merge pull request #175 from teamfisk/EntitiesWithoutTransform Tobias Dahl 2016-03-11 14:20:23 +01:00
  • 0aedeb61b4 CapturePointSystem now sets all children visible/not visible for each red/blue/spectator CapturePointFixBranch verysecrethero 2016-03-11 14:15:46 +01:00
  • 44398eac58 Options now has some different resolutions. Tleety 2016-03-11 14:11:58 +01:00
  • 06bddd9d54 Fixed requests. Jocke 2016-03-11 14:07:03 +01:00
  • 4937bee46a Unresolved externals shit Tleety 2016-03-11 13:38:48 +01:00
  • bb0531a459 WIP Tleety 2016-03-11 13:10:08 +01:00
  • 8bd38bc465 Merge branch 'Menu' of github.com:teamfisk/TacticalZ into Menu Tleety 2016-03-11 13:00:43 +01:00
  • 8ceaae995d Options menu started working on Tleety 2016-03-11 13:00:34 +01:00
  • 5f959ded89 Did changes upon pull request's request. Jocke 2016-03-11 12:54:59 +01:00
  • 0fbc482f9c Changed getters to return reinterpret_casted data. Jocke 2016-03-11 12:22:55 +01:00
  • 2eb863757b renamed variabels Jocke 2016-03-11 11:55:16 +01:00
  • e0a1550acd You can now choose if you want to become a client or a server from the menu. FriendlyHost/Join stiffly 2016-03-11 11:49:38 +01:00
  • 91aedcbb14 Merge branch 'Menu' of https://github.com/teamfisk/TacticalZ into Menu Teejoon 2016-03-11 11:41:11 +01:00
  • cac0522ae7 Fixed glow on window resize Teejoon 2016-03-11 11:41:02 +01:00
  • 26dde21e3d Merge branch 'Menu' of github.com:teamfisk/TacticalZ into Menu Tleety 2016-03-11 11:32:18 +01:00
  • 23e6a15c7f Fixed the fill on sprites, added some config button components, started work on option menu Tleety 2016-03-11 11:31:53 +01:00
  • 266aca467e Merge remote-tracking branch 'origin/Weapons' into Movement viktorljung 2016-03-11 11:25:43 +01:00
  • e96ad44e44 BlurHUDPass now works correct when resizing window. Teejoon 2016-03-11 11:23:23 +01:00
  • f89cef7a78 Text still disappears if its behind transparent sprites TextFix viktorljung 2016-03-11 11:23:15 +01:00
  • a3ab844cc4 Makes sure m_CurrentSelection is valid before using it. EntitiesWithoutTransform stiffly 2016-03-11 11:12:49 +01:00
  • 03493df213 Merge remote-tracking branch 'origin/master' into EntitiesWithoutTransform stiffly 2016-03-11 11:06:23 +01:00
  • 7febb7681c Merge remote-tracking branch 'origin/master' into SplitSnapshots Jocke 2016-03-11 11:05:41 +01:00
  • 7d4b9927d8 Now start a server on Host button. stiffly 2016-03-11 11:05:37 +01:00
  • e000408593 Getting ShaderID one time per material in total instead of one time every frame RendererBugFixes Teejoon 2016-03-11 11:03:09 +01:00