Commit Graph

  • 7dbb9e452b Added a announcer volume channel. stiffly 2016-02-24 15:08:39 +01:00
  • f7ef6707a7 Merge pull request #116 from teamfisk/SeeTeamMates Tobias Dahl 2016-02-24 15:05:19 +01:00
  • feeff5b164 Debug tool for different CubeMap Tleety 2016-02-24 14:47:47 +01:00
  • 7394436e7a Removed unnecessary comment. stiffly 2016-02-24 14:23:54 +01:00
  • f41e0b29be assets Tleety 2016-02-24 14:21:48 +01:00
  • cf3d1b5b00 Changed the default reference distance for emitters. Should be heard all over the map stiffly 2016-02-24 14:19:38 +01:00
  • 9783f9c650 Added an event to change the background music. stiffly 2016-02-24 14:18:42 +01:00
  • 607e83134d Cubemaps working Tleety 2016-02-24 14:16:49 +01:00
  • 5af4f9d8e7 Removed a comment originating from HUDDesynch branch verysecrethero 2016-02-24 14:06:41 +01:00
  • af68236e71 now using a define INDICATOR_TEST to activate the DamageIndicatorSystem test. verysecrethero 2016-02-24 13:58:05 +01:00
  • 6f9ce8a0c1 WIP Tleety 2016-02-24 13:57:54 +01:00
  • 6465fe6ed6 Have fix the resizing errors ResizeWindowFixFromSSAOMerge Teejoon 2016-02-24 13:22:41 +01:00
  • f72dea3852 Added a system that will handle BGM. Created specific logic for sounds to loop like Petter wants. stiffly 2016-02-24 11:51:06 +01:00
  • 06ea99a769 SSAO now have outcommented code for MipMaps. I couldn't see any gain from having mipmaps. But it's there if some one wants to try Teejoon 2016-02-24 11:26:06 +01:00
  • 4aaba03852 Moved some events to their correct place Jace 2016-02-24 11:04:56 +01:00
  • fa13c1d065 Double jump is now working. Jocke 2016-02-23 18:24:46 +01:00
  • a36deb2cf9 WIP, trying to figure out why minidumps doesn't work. William Moberg 2016-02-23 18:19:48 +01:00
  • e2831c5593 CapturePointSystem fix, DamageIndicatorSystem fix verysecrethero 2016-02-23 17:29:33 +01:00
  • 8d23c531af Cubemaps kinda functioning, still somthing wierd with the vectors. Tleety 2016-02-23 17:17:50 +01:00
  • 9bba9e493c Done with the fix & test for DamageIndicatorSystem verysecrethero 2016-02-23 17:12:16 +01:00
  • 606a9bf94f BlendTree now working but has some memory leaks viktorljung 2016-02-23 17:06:41 +01:00
  • 91b0ac5fbd Some groundwork for cubemaps. Tleety 2016-02-23 16:00:43 +01:00
  • 2c9c374f51 Almost done with the fix for DamageIndicatorSystem verysecrethero 2016-02-23 15:54:44 +01:00
  • 8a04e87494 The serverlist is displayed when pressing connect button. stiffly 2016-02-23 14:31:35 +01:00
  • 25a7240962 Fix for PlayerSpawnSystem verysecrethero 2016-02-23 13:55:24 +01:00
  • 99cdcdf289 CapturePointSystem now re-reads the CapturePoints if the map has "changed"... verysecrethero 2016-02-23 11:59:18 +01:00
  • f1d78ae790 Fixed CapturePointSystem verysecrethero 2016-02-23 11:52:30 +01:00
  • d77119bb2d Fixed print for serverlist. stiffly 2016-02-23 11:47:44 +01:00
  • 27669b7383 Merge remote-tracking branch 'origin/master' into HUDDesync stiffly 2016-02-23 11:09:44 +01:00
  • fc7d62a5ad Various clean ups. stiffly 2016-02-23 11:07:56 +01:00
  • c42e1e0967 SoundSystem Fix. Now subscribes to an event that was thought to be listened to. stiffly 2016-02-23 11:07:41 +01:00
  • fe9dbf0b0f Serverlist fix. stiffly 2016-02-23 10:33:20 +01:00
  • fb80d088e4 Redid many a thing for the sake of efficiency FakeShemp 2016-02-23 10:06:21 +01:00
  • 4ffb03fdd5 Merge remote-tracking branch 'origin/master' into SmallFixes-Tobias SmallFixes-Tobias Tleety 2016-02-23 10:02:53 +01:00
  • bcc42a8cb7 Merge remote-tracking branch 'origin/HUDDesync' into AndersTestNetwork verysecrethero 2016-02-23 09:50:55 +01:00
  • fe3e0bac5b Changed SpritIndicator values on player Teejoon 2016-02-22 18:45:02 +01:00
  • fa4f007604 Changed name from Indicator to SpriteIndicator. Can now be an indicator for a single team or every one Teejoon 2016-02-22 18:35:00 +01:00
  • 127edb4e60 Fixed some memory leaks viktorljung 2016-02-22 17:47:30 +01:00
  • 041c409128 Misc TestBranch testing verysecrethero 2016-02-22 17:46:49 +01:00
  • e5ff88d3c9 SoundSystem bug fix stiffly 2016-02-22 17:39:59 +01:00
  • 845a30ed0f Merge remote-tracking branch 'origin/DynamicPacketBuffer' into HUDDesync stiffly 2016-02-22 17:39:48 +01:00
  • 34a71b0767 Fixed linking issue. DynamicPacketBuffer Jocke 2016-02-22 17:24:35 +01:00
  • 833006744a WIP stiffly 2016-02-22 17:00:25 +01:00
  • b2d8cddfb7 WE now send the map on connect after that only player information. Jocke 2016-02-22 16:46:31 +01:00
  • 6fab971734 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates Teejoon 2016-02-22 16:43:18 +01:00
  • 2c18068059 Merge pull request #126 from teamfisk/SSAO Viktor Ljung 2016-02-22 16:40:11 +01:00
  • 09aec08d0e Pull request fixes Teejoon 2016-02-22 16:38:20 +01:00
  • ed9149fe63 Network buffer should now dynamically increase when needed. Jocke 2016-02-22 16:01:26 +01:00
  • abd36c81f8 Added BlendTree that stores and blends multiple animations viktorljung 2016-02-22 15:58:38 +01:00
  • 4cf8c3d8d7 Fixed PerformanceTimer start and stop in Renderer.cpp since I have changed a little code there Teejoon 2016-02-22 15:02:20 +01:00
  • 37414ce124 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SSAO Teejoon 2016-02-22 14:51:42 +01:00
  • adceccf402 SSAO now working. Changed in DrawFinalePass so that th AOTexture is on texture position 0 and only get binded once. Teejoon 2016-02-22 14:48:20 +01:00
  • 4c1a284636 Server now does Capture point logic too. stiffly 2016-02-22 11:30:31 +01:00
  • 23dc8e07b2 Will this do the trick? Now tells the server to send HUD entities too. stiffly 2016-02-22 10:41:37 +01:00
  • c7d31cac2d Merge remote-tracking branch 'origin/master' into FriendlyHost/Join stiffly 2016-02-22 10:19:48 +01:00
  • a1e932d261 Merge remote-tracking branch 'origin/master' into FriendlyHost/Join stiffly 2016-02-22 10:06:51 +01:00
  • 070f1bd394 Merge remote-tracking branch 'origin/FriendlyHost/Join' into FriendlyHost/Join stiffly 2016-02-22 10:06:25 +01:00
  • 993d804cef Added an event to search for servers. stiffly 2016-02-19 15:38:09 +01:00
  • 201480b17f SSAO is working, but is kinda crappy. You can change shade variables in the debug window. Teejoon 2016-02-19 16:50:04 +01:00
  • bac23f6e8c Merge pull request #124 from teamfisk/FixNetworkBugs William Moberg 2016-02-19 16:47:34 +01:00
  • 68f2d5327d added extra check in HealthSystem Jocke 2016-02-19 16:37:26 +01:00
  • 2263fd2ad6 Fixed crash in Client::parsePlayerDamage. Jocke 2016-02-19 16:18:16 +01:00
  • 2f259c3773 Added an event to search for servers. stiffly 2016-02-19 15:38:09 +01:00
  • 8cc928b5f4 Merge pull request #122 from teamfisk/WorldSnapshots William Moberg 2016-02-19 15:12:31 +01:00
  • 881ce7b02f Proper string handling without nasty memory leaks. PHEW. Jace 2016-02-19 14:37:14 +01:00
  • c130fdda5e Merge pull request #123 from teamfisk/BoxModelCollision Jace 2016-02-19 14:53:37 +01:00
  • 97fcdb342d Bloom should now show behind transparent objects. Tleety 2016-02-19 14:23:40 +01:00
  • 4c87ca10b9 Merge branch 'master' into BoxModelCollision William Moberg 2016-02-19 14:17:17 +01:00
  • 22664848dc You should not be able to fall through ground or dash thru walls. Very thin objects may still be possible to go through, e.g. the grid border walls in GameMap.xml. William Moberg 2016-02-19 14:16:22 +01:00
  • d135ea2da6 Small fix Tleety 2016-02-19 13:53:43 +01:00
  • 949ee76f55 Fallow and name fix Tleety 2016-02-19 13:52:16 +01:00
  • 844825813b Merge pull request #121 from teamfisk/ResolutionChange Jace 2016-02-19 13:31:06 +01:00
  • 722b795d37 Fixed spelling Tleety 2016-02-19 13:30:41 +01:00
  • b547938928 timestep logic added, but is not used. FixNetworkFul-Hacks Jocke 2016-02-19 13:24:06 +01:00
  • cf2bf4e14d Merge remote-tracking branch 'origin/master' into ResolutionChange Tleety 2016-02-19 13:17:31 +01:00
  • 2ac584bafb Merge pull request #113 from teamfisk/Menu-Tobias Jace 2016-02-19 13:16:50 +01:00
  • 6e5335a266 Release now return name and entity of the entity that was previously klicked. Tleety 2016-02-19 13:16:26 +01:00
  • fc5d054cb2 Entity is now sent with the click events. Tleety 2016-02-19 12:49:07 +01:00
  • 8c9f4bb84b Resize should now be working correctly. Tleety 2016-02-19 11:42:52 +01:00
  • 73a4336206 Try some stuff FakeShemp 2016-02-18 23:33:10 +01:00
  • f2ab02d860 More WIP FakeShemp 2016-02-18 22:38:50 +01:00
  • bf376f54b6 WIP FakeShemp 2016-02-18 20:48:39 +01:00
  • e15a7b9485 You can now change resolution without any apparent bugs. Tleety 2016-02-18 18:00:26 +01:00
  • 3c9c95cff4 Animation blending improved and Animation Override added viktorljung 2016-02-18 16:34:18 +01:00
  • a141da3d8c Merge pull request #118 from teamfisk/AndersTest William Moberg 2016-02-18 15:29:33 +01:00
  • b81bb9eeea Changed SprintAbility to take StrengthOfEffect. PlayerMovementSystem: if Sniper is sprinting he will now move faster. verysecrethero 2016-02-18 15:17:19 +01:00
  • ca907b912e Copy constructor for deep copy of World. Jace 2016-02-18 13:54:32 +01:00
  • b2304a95f8 Fixed some XML documentation verysecrethero 2016-02-18 13:49:22 +01:00
  • 8c92b7ceb6 Small cleanup. Clarified a few comments verysecrethero 2016-02-18 13:40:17 +01:00
  • 97499f1c28 Made ComponentPool copyable by making sure string fields are handled properly Jace 2016-02-18 11:37:03 +01:00
  • 64610e3c03 Fixed so some of the tests are working again. Also removed the test errors verysecrethero 2016-02-18 11:27:07 +01:00
  • 7f489b3569 Added Assault,Defender,Sniper Components,Entities. Added ShieldAbility,Sprintability-Component (not implemented). Changed BoostSystem to use a childed Boost to the player. All friendly fire is 0 damage. verysecrethero 2016-02-18 10:40:09 +01:00
  • 5dd85d2748 Merge pull request #110 from teamfisk/PerformanceTiming Jace 2016-02-18 10:33:24 +01:00
  • 261c2e021e Merge pull request #115 from teamfisk/Respawning Jace 2016-02-18 10:26:08 +01:00
  • 581a7b470c Merge pull request #94 from teamfisk/AndersTest William Moberg 2016-02-18 10:21:37 +01:00
  • 178402e964 cascade shadow wip FakeShemp 2016-02-18 10:08:29 +01:00
  • c3ed429377 Added BoostSystem, Added BoostAssault entity XML verysecrethero 2016-02-17 18:11:36 +01:00
  • c4d3c515e4 Marge with Master Teejoon 2016-02-17 18:04:49 +01:00
  • 7cc58dc94c Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates Teejoon 2016-02-17 18:00:30 +01:00
  • 5e3af7ac5d Player Indicator now working OK. Scaling depending on how far away you are makes the Indicator to hide players head behind it. Shields are making indicators to disappear. Teejoon 2016-02-17 17:58:01 +01:00