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

Commit Graph

  • 77eaa45702 Merge remote-tracking branch 'origin/master' into HEAD Teejoon 2016-03-01 12:11:27 +01:00
  • a806f9b1e3 WIP RenderSettings Teejoon 2016-03-01 12:04:26 +01:00
  • dfa224b4dd Merge pull request #142 from teamfisk/Respawning Tobias Dahl 2016-03-01 11:28:56 +01:00
  • 86df8f14f4 Merge pull request #143 from teamfisk/Transparency-fix Jace 2016-03-01 11:26:26 +01:00
  • eaea645068 Reflectance should now work as an inverse of the specular alpha value. Tleety 2016-03-01 11:19:44 +01:00
  • 21bf7f4df3 Glow should now legit be working through transparency. Tleety 2016-03-01 11:03:16 +01:00
  • e2b7e5400d Check so CapturePointGameMode pool exists and has a size. William Moberg 2016-03-01 10:20:52 +01:00
  • 37996b4e18 Merge remote-tracking branch 'origin/master' into AndersTest verysecrethero 2016-03-01 09:47:24 +01:00
  • 4153a31e3a Fix goof. FakeShemp 2016-02-29 19:47:24 +01:00
  • 0908be1e02 Shadows are pretty much done. FakeShemp 2016-02-29 19:45:56 +01:00
  • 2ed5fad699 The shadows are working FakeShemp 2016-02-29 19:17:16 +01:00
  • 70374fa10e It compiles, but no shadows FakeShemp 2016-02-29 18:20:32 +01:00
  • 658eace093 Added component CapturePointGameMode that contains respawntime. William Moberg 2016-02-29 18:20:14 +01:00
  • 20468cba1b Merge branch 'master' into Shadows FakeShemp 2016-02-29 18:03:00 +01:00
  • c106768939 Merge pull request #135 from teamfisk/JumpHeightAdjustment Joachim Pettersson 2016-02-29 17:37:25 +01:00
  • c7dad79e72 Merge branch 'master' into JumpHeightAdjustment William Moberg 2016-02-29 17:28:40 +01:00
  • d37f8cc350 Merge pull request #141 from teamfisk/BoxModelCollision Joachim Pettersson 2016-02-29 17:13:34 +01:00
  • 2c56b03b2b Merge remote-tracking branch 'origin/master' into Kill-streak-sounds stiffly 2016-02-29 16:41:29 +01:00
  • 4fd578c764 Removed logic that's no longer needed. stiffly 2016-02-29 16:26:09 +01:00
  • 5bc0483f49 Removed AnimationOffset and improved BlendTree viktorljung 2016-02-29 15:51:37 +01:00
  • 3c35c0a956 Frustum culling octree updates after collisions, no more disappearing weapons. William Moberg 2016-02-29 15:50:26 +01:00
  • d47a806c64 Made a easy hack to solve jittering when standing still. Jittering should still be present when moving, but at least it is less prominent when moving. William Moberg 2016-02-29 15:49:23 +01:00
  • 8e21c5a5e4 Reverts last WIP since it probably added code without improving anything. William Moberg 2016-02-29 15:38:36 +01:00
  • 22748f6594 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into RenderSettings Teejoon 2016-02-29 11:46:08 +01:00
  • df7ace6626 We only uses one depth buffer now Teejoon 2016-02-29 11:44:29 +01:00
  • bef79d116b Merge remote-tracking branch 'origin/master' into FixNetworkBugs Jocke 2016-02-29 10:15:16 +01:00
  • db5170c699 WIP, should take shortest resolution even if forced upwards because of slopes, not solving the jittering problem though. + debug code. William Moberg 2016-02-29 09:37:51 +01:00
  • bb76c9d248 WIP multi-weapon behaviours Jace 2016-02-25 16:24:38 +01:00
  • 7749fc5474 Small fixing up FakeShemp 2016-02-28 19:46:50 +01:00
  • 6dd7f1a657 Buggy transparent shadows. FakeShemp 2016-02-28 18:00:23 +01:00
  • 144e548b7a Added AbilityCooldownHUD component and system to track the cooldown on the dashability, this needs to be extended for other abilities when they are implemented. However current dash time needs to be included into the component, since we can currently just see the max cooldown time. Tleety 2016-02-28 17:17:24 +01:00
  • 9cbc6f7755 Added GenerateTexture, GenerateMipMapTexture and DeleteTexture to CommonFunctions Teejoon 2016-02-28 16:16:22 +01:00
  • d3a245606a SSAO and Glow is no longe conflicting with each other. Teejoon 2016-02-28 15:02:40 +01:00
  • 14b0a64720 begin fixing transparent object's shadows FakeShemp 2016-02-27 18:42:51 +01:00
  • 8647267cad Make code less dumb, save 7 fps FakeShemp 2016-02-27 18:04:33 +01:00
  • ecab5de056 Various shadow calculation methods implemented and ready for use. FakeShemp 2016-02-27 16:35:15 +01:00
  • 38d8cdded2 Texture Array is now working. Enjoy your single Bind(). FakeShemp 2016-02-27 15:53:28 +01:00
  • cc5943fcee WIP fix? TempBranchSak Teejoon 2016-02-26 18:36:49 +01:00
  • b320d8d1e4 WIP Teejoon 2016-02-26 18:01:38 +01:00
  • b1a59e0ed2 Includes now use the key #include. Fixed a bug where it would crash if the file is not found. Fixed a bug where null terminators where included from the included file, causing it to stop reading after the first included file. Render_Optimization Tleety 2016-02-26 17:46:18 +01:00
  • 22c391df54 Initial work on texture arrays FakeShemp 2016-02-26 17:40:35 +01:00
  • 37918a9c4a Merge remote-tracking branch 'origin/master' into AndersTest verysecrethero 2016-02-26 17:03:10 +01:00
  • 335fda47d6 DamageIndicatorSystem can no longer crash if the player doesnt have a parent (rare bug) verysecrethero 2016-02-26 17:02:27 +01:00
  • afddd276a4 Merge remote-tracking branch 'origin/master' into FixNetworkBugs Jocke 2016-02-26 16:54:09 +01:00
  • a48e1b567a Removed comments Jocke 2016-02-26 16:49:25 +01:00
  • 67dffafe5a Drumloop will now play when a team is about to win stiffly 2016-02-26 16:44:08 +01:00
  • b3038ef713 Includes are now supported in shader with the key #GLSL Tleety 2016-02-26 16:33:55 +01:00
  • 764a3f454e Further work on the Pickup fix verysecrethero 2016-02-26 14:08:34 +01:00
  • 62e22d3821 Fix Teejoon 2016-02-26 13:32:16 +01:00
  • 0805375483 Deleted SSAO sliders except Quality Teejoon 2016-02-26 13:25:19 +01:00
  • 73064c7257 Broken undo EditorUndo Jace 2016-02-26 12:47:09 +01:00
  • fa78991795 World::MemoryUsage returns approximate value of component pool memory usage Jace 2016-02-26 11:08:39 +01:00
  • 0c60b637c3 Who's merging without compiling? Jace 2016-02-26 12:52:10 +01:00
  • d411de894f Merge pull request #140 from teamfisk/FixNetworkBugs William Moberg 2016-02-26 12:01:19 +01:00
  • f56705d921 You can now change the quality of SSAO by sliding the SSAO Quality Teejoon 2016-02-26 11:51:20 +01:00
  • fc2d588bf9 Initial SpawnSystem fixes verysecrethero 2016-02-26 11:15:00 +01:00
  • 18450ff4f3 Death explosion should always get triggered now. (I hope) Jocke 2016-02-26 11:08:05 +01:00
  • 22b473a0b6 Merge pull request #139 from teamfisk/EditorCopyPaste William Moberg 2016-02-26 11:01:18 +01:00
  • f220d8088c Begin clean-up FakeShemp 2016-02-26 10:53:16 +01:00
  • 10cd3bae40 experimental changes AndersTestNetwork verysecrethero 2016-02-26 10:33:15 +01:00
  • 5c3b472a4d Merge remote-tracking branch 'origin/master' into Animations viktorljung 2016-02-26 10:21:22 +01:00
  • af034673f6 BoneAttachments now working and BlendTrees are created in the AnimationSystem viktorljung 2016-02-26 10:17:47 +01:00
  • df2e4abb52 WE HAVE WORKING CASCADE SHADOWS FakeShemp 2016-02-25 21:21:38 +01:00
  • 8867e7ac3c Working shadows, no cascade blend yet FakeShemp 2016-02-25 20:29:41 +01:00
  • 21ca3f5b38 Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-02-25 18:22:13 +01:00
  • f161fce719 Merge pull request #138 from teamfisk/PlayerAtOriginFix Jace 2016-02-25 17:55:03 +01:00
  • 0343683678 Fixed cubemaps being generated over and over again each frame. Jace 2016-02-25 17:51:40 +01:00
  • 9e6c67596d Basic editor copy and paste. Doesn't actually copy the entity until you paste it. Jace 2016-02-25 17:51:28 +01:00
  • cedcffcf97 WIP multi-weapon behaviours Defender Jace 2016-02-25 16:24:38 +01:00
  • 89d0d5753f Fix for player teleporting to (0,0,0). Saves player previous position in CollisionSystem instead of Physics component so it won't be saved when editing Players. William Moberg 2016-02-25 16:16:24 +01:00
  • 748a178801 Merge pull request #136 from teamfisk/FixNetworkBugs Adam Byléhn 2016-02-25 16:09:08 +01:00
  • eac9a9daf6 Pull request #136 Merge remote-tracking branch 'origin/master' into FixNetworkBugs Jocke 2016-02-25 16:07:06 +01:00
  • d9afb527a4 Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-02-25 16:06:29 +01:00
  • 059fe5c6c0 Fixed typo m_EPDoubleJump to m_EDoubleJump. Jocke 2016-02-25 16:04:27 +01:00
  • bb6e491eed Fix for GLERROR in DrawModelRenderQueues Teejoon 2016-02-25 16:00:27 +01:00
  • fb465ede81 Merge pull request #134 from teamfisk/HUDDesync Joachim Pettersson 2016-02-25 15:53:07 +01:00
  • 669a7d13cf We can now export and import collision meshes :D Teejoon 2016-02-25 15:39:42 +01:00
  • 8740e8b77a experimental fix for pickup verysecrethero 2016-02-25 15:23:00 +01:00
  • f66fa7a183 Merge remote-tracking branch 'origin/master' into FixNetworkBugs Jocke 2016-02-25 15:13:11 +01:00
  • 508d8a6f00 Fixed memory leak in TCPServer::AcceptNewConnections caused by acceptor->async_accept(). Jocke 2016-02-25 14:24:38 +01:00
  • 9229b77893 Export Collision mesh Teejoon 2016-02-25 13:19:35 +01:00
  • cd315bbaa0 Added DoubleJump component and JumpSpeed in Player component so jumpheight can be adjusted for regular jump and double jump. William Moberg 2016-02-25 12:12:44 +01:00
  • 8ce6308649 In snapshot: now sends player information and also CP information. Now it is no longer true that they will arrive in pre order. Appropriate actions were therefor implemented. stiffly 2016-02-25 11:56:40 +01:00
  • f10958c268 Capturepoint logic is now purely done on the serverside. stiffly 2016-02-25 11:50:29 +01:00
  • c97d0d9381 Fixed memory leaks and cleaned up Skeleton and BlendTree viktorljung 2016-02-25 11:30:09 +01:00
  • ad97f7f8a9 Merge branch 'master' of https://github.com/teamfisk/TacticalZ antc13 2016-02-25 10:55:20 +01:00
  • c9c5e9841d New Map WIP, Map2 version 2 is with models on both sides. antc13 2016-02-25 10:55:14 +01:00
  • bc227c3d61 Merge remote-tracking branch 'origin/master' into AndersTestNetwork verysecrethero 2016-02-25 10:30:35 +01:00
  • da1c7b3093 Merge pull request #133 from teamfisk/AndersTest William Moberg 2016-02-25 09:58:14 +01:00
  • ef87102d1f Ammo,HealthPickup now takes in account for possible parenting/childing of the pickup. Also saved the xml files with the new scaling verysecrethero 2016-02-24 17:53:37 +01:00
  • cca237b33f miscellaneous tests verysecrethero 2016-02-24 17:43:24 +01:00
  • 09249c970a Commitiing assets SeeTeamMates Teejoon 2016-02-24 17:42:55 +01:00
  • ddb969f1f0 MipMap is working. But no gain :C SSAO Teejoon 2016-02-24 17:31:14 +01:00
  • 05bbecc452 WIP, minidump is done in another program, started from our app. William Moberg 2016-02-24 17:23:47 +01:00
  • 9a41bda4cf Merge pull request #132 from teamfisk/CubeMap Jace 2016-02-24 16:03:49 +01:00
  • fc18932068 Merge remote-tracking branch 'origin/master' into CubeMap CubeMap Tleety 2016-02-24 15:45:30 +01:00
  • 7cd4dac909 Created "EntitySystem" class as means to group a World with a SystemPipeline GameMode Jace 2016-02-24 15:27:41 +01:00
  • b874ea8641 Merge pull request #131 from teamfisk/ResizeWindowFixFromSSAOMerge Tobias Dahl 2016-02-24 15:22:12 +01:00
  • 2609a0253d Merge pull request #129 from teamfisk/HUDDesync Tobias Dahl 2016-02-24 15:22:01 +01:00
  • de309d3b9d Merge pull request #130 from teamfisk/AndersTest William Moberg 2016-02-24 15:17:36 +01:00