Commit Graph

  • 0a8a9e5099 Merge remote-tracking branch 'origin/master' into Networking stiffly 2015-12-15 11:50:01 +01:00
  • 1689370356 Export the skeletons FakeShemp 2015-12-15 11:49:59 +01:00
  • f9508657f5 Merge remote-tracking branch 'origin/master' into AndersTest verysecrethero 2015-12-15 11:32:47 +01:00
  • b698a0d36f WIP stiffly 2015-12-15 11:21:46 +01:00
  • 1229a99af4 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree verysecrethero 2015-12-15 11:07:51 +01:00
  • 8e431c8edd RayVsModel && RayVsAABB tests added and working. Also adjusted RayVsModel,RayVsAABB with deltas when values are very close to each other (floatingprecision problems) verysecrethero 2015-12-15 11:07:09 +01:00
  • 51dd627ae3 Added Fonts to deploy.bat Jace 2015-12-14 22:32:20 +01:00
  • c296c4eb3b Fixed picking pass... again... Jace 2015-12-14 21:30:43 +01:00
  • 422e6f5264 Created a RenderState for ImGuiRenderPass Jace 2015-12-14 20:25:16 +01:00
  • 9cee8b5478 Merge pull request #16 from teamfisk/Editor Viktor Ljung 2015-12-14 20:25:10 +01:00
  • 522679b14c Added BlendEquation and BlendFunc to RenderState, and cleaned it up A LOT Jace 2015-12-14 20:13:45 +01:00
  • d9ea0192d1 Added RenderSystem and removed RenderQueueFactory viktorljung 2015-12-14 20:07:02 +01:00
  • ef07a9d536 Merge remote-tracking branch 'origin/master' into Rendering viktorljung 2015-12-14 19:11:00 +01:00
  • 05b78265be Fixed some transparency bugs and started on component based camera viktorljung 2015-12-14 19:10:00 +01:00
  • 25683e8a8a Merge pull request #15 from teamfisk/Editor Viktor Ljung 2015-12-14 19:05:27 +01:00
  • 948f6d5de7 RayVsModel & RayVsAABB comparison continued verysecrethero 2015-12-14 17:53:11 +01:00
  • ae7d4b9097 Put Collision folder in CMakeLists.txt and altered paths. William Moberg 2015-12-14 17:35:39 +01:00
  • 7c714d1f98 Changed some error handling in the RenderState class. Tleety 2015-12-14 17:35:01 +01:00
  • e6fa9df3a5 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree William Moberg 2015-12-14 17:08:51 +01:00
  • 59095c2ce5 Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder. William Moberg 2015-12-14 17:08:00 +01:00
  • 3f77da4a07 Merge remote-tracking branch 'origin/master' into Networking stiffly 2015-12-14 17:07:12 +01:00
  • 7f8e78c8cd RayVsModel tests in progress verysecrethero 2015-12-14 17:04:35 +01:00
  • bac0a1de26 Removed annoying cube stiffly 2015-12-14 16:55:23 +01:00
  • bf82bbb5d5 Merge remote-tracking branch 'origin/Networking' into Networking stiffly 2015-12-14 16:50:51 +01:00
  • e52052b431 IdentifyPacketLoss() crashed when multiple users connected which Jocke 2015-12-14 16:50:16 +01:00
  • 8d9ff2b6dc Merge remote-tracking branch 'origin/Networking' into Networking stiffly 2015-12-14 16:41:59 +01:00
  • 63db236dfa Fixed bug which made the player not able to move diagonally. Jocke 2015-12-14 16:35:43 +01:00
  • cddd9026fb Toggle editor with "ToggleEditor" command. Enable editor with "Debug.EnableEditor" config variable. Jace 2015-12-14 16:12:52 +01:00
  • ea239b19bd Fixed component type resolution order to prioritize custom types before native ones, since namespace information doesn't exist at that stage. Jace 2015-12-14 16:12:20 +01:00
  • f8d927cd91 Don't render invisible model components Jace 2015-12-14 16:11:37 +01:00
  • 798c73132e Fixed ScreenCoords::ToPixelData stack corruption Jace 2015-12-14 16:11:08 +01:00
  • fb2cd0c6ae Fixed float angle wrapping Jace 2015-12-14 15:20:55 +01:00
  • bc6a211276 Removed RenderState log spam Jace 2015-12-14 14:54:11 +01:00
  • 7719274a37 Correct asset reference for fonts Jace 2015-12-14 14:53:57 +01:00
  • 123c198e19 Text component added and Text render queue viktorljung 2015-12-14 14:48:24 +01:00
  • 797036c204 Fixed picking event Jace 2015-12-14 14:19:45 +01:00
  • 3a9577c9fb fixup! Enabled rendering "transparency" Jace 2015-12-14 14:08:05 +01:00
  • 545869e342 Added scene graph UI to Editor Jace 2015-12-13 23:41:00 +01:00
  • 07c4744436 Added World DeleteEntity, HasComponent and GetEntityChildren Jace 2015-12-13 23:40:45 +01:00
  • b8620eac26 Made debug camera detect UI focus properly Jace 2015-12-13 23:39:59 +01:00
  • 7bc492134d Enabled rendering "transparency" Jace 2015-12-13 23:39:37 +01:00
  • 7c1182c28f Fixed absolute positions once and for all (maybe?) Jace 2015-12-13 23:39:22 +01:00
  • 2f3843e595 Editor version 1 Jace 2015-12-13 20:06:21 +01:00
  • 5f3c234819 Added DeleteComponent function to world Jace 2015-12-13 20:05:57 +01:00
  • 9a119f38bb Added events processing to SystemPipeline Jace 2015-12-13 20:05:48 +01:00
  • 524af211e0 Made resource loading fail gracefully when a resource can't be loaded. Resources should now throw exceptions in their constuctor if the resource can't be loaded. This will result in ResourceManager::Load returning null. Jace 2015-12-13 20:04:50 +01:00
  • 91ace0d2a0 Fixed bug in ComponentPool::Delete. Wasn't taking EntityID into account when freeing memory. Jace 2015-12-13 19:59:50 +01:00
  • 2018ba27ae Added KnowsEntity function to ComponentPool to query whether an entity has a component attached Jace 2015-12-13 19:59:25 +01:00
  • b66cf47ff0 Revert "Clearing raw input events from event broker to encourage use of input commands instead" Jace 2015-12-13 13:53:03 +01:00
  • e5084e13ec Added EditorSystem Jace 2015-12-13 13:37:32 +01:00
  • 8a6030bf57 Added support for "Impure" systems, which only update once per frame and contain their own logic for manipulating the world, instead of relying on a single list of components. Jace 2015-12-13 13:37:14 +01:00
  • 2e321e15a5 Cleaned up ImGuiRenderPass Jace 2015-12-12 18:42:00 +01:00
  • c81a054601 Subscribed ImGui to MouseScroll event Jace 2015-12-12 18:31:03 +01:00
  • af14d60493 Added MouseScroll event to input manager Jace 2015-12-12 18:30:50 +01:00
  • 0465fdb16d Added ImGui for compilation Jace 2015-12-12 18:18:10 +01:00
  • 0c6ac1e060 Added ImGui to README Jace 2015-12-12 18:14:42 +01:00
  • 7db1feac17 Added basic ImGui implementation Jace 2015-12-12 18:08:10 +01:00
  • 653b4689b5 Added KeyboardChar event for keyboard text input Jace 2015-12-12 18:07:53 +01:00
  • 6723e71fee Merge pull request #14 from teamfisk/Input Adam Byléhn 2015-12-14 13:55:11 +01:00
  • d16cbe84f0 Merge remote-tracking branch 'origin/master' into Input Jace 2015-12-14 13:40:22 +01:00
  • 95ce024bb6 Merge pull request #13 from teamfisk/RendererDecoupling Jace 2015-12-14 13:39:20 +01:00
  • a7ed455766 Merge branch 'master' into Input Jace 2015-12-14 13:19:38 +01:00
  • d182e6c453 Merge remote-tracking branch 'origin/master' into RendererDecoupling Tleety 2015-12-14 13:16:56 +01:00
  • 60b3ce89b2 Skeleton/Joints WIP antc13 2015-12-14 12:59:54 +01:00
  • 5fce7490a9 MergeFix OctTree williambranch and andersbranch verysecrethero 2015-12-14 11:57:18 +01:00
  • e76a6b74a3 Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2015-12-14 11:41:59 +01:00
  • e82911cb8b Renderer FOV setting in Config.ini Jace 2015-12-14 11:39:13 +01:00
  • 8abef7024d Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree verysecrethero 2015-12-14 11:14:09 +01:00
  • bf08ffe392 Added InputManagerTest verysecrethero 2015-12-14 11:02:23 +01:00
  • 5f5cab1171 Added Tests for ResourceManager verysecrethero 2015-12-14 10:55:49 +01:00
  • 8d87841691 Merge branch 'master' into OctTree William Moberg 2015-12-14 10:51:23 +01:00
  • 11e37ca898 Added functions to test ray vs triangle- and model-intersections. William Moberg 2015-12-14 10:42:45 +01:00
  • 589ca45936 Removed debug output Input-XboxController Jace 2015-12-12 13:47:08 +01:00
  • 0cff07101c Xbox Controller support Jace 2015-12-11 23:21:28 +01:00
  • 30474b70df MouseInputHandler Jace 2015-12-11 18:03:48 +01:00
  • 03e226ffea Refactored InputProxy to gracefully handle cases where multiple origins send the same command Jace 2015-12-11 17:15:33 +01:00
  • 2e7e8d3546 Clearing raw input events from event broker to encourage use of input commands instead Jace 2015-12-11 14:50:14 +01:00
  • 013f911ae2 Added MouseInputHandler and firstPersonInputController to aid in creation of first person movement. Jace 2015-12-11 14:49:43 +01:00
  • 35624008e7 InputProxy with a KeyboardInputHandler to translate keyboard keys to input commands. Input origins are bound to commands through the BindOrigin event, or through loading them from a config file. Jace 2015-12-11 11:39:20 +01:00
  • 5d46a10a4e Added GetAll function to config file that returns a list of all top level keys in a config file Jace 2015-12-11 10:58:59 +01:00
  • 784a04b8ad Fixed bug in config file overriding. Previously it was silently overwriting the whole default config and relied on hardcoded values for defaults. Jace 2015-12-11 10:58:32 +01:00
  • bffc97f310 Groundwork for input command proxy Jace 2015-12-11 00:37:48 +01:00
  • 7464facab9 Next generation raptor copter Jace 2015-12-12 03:38:17 +01:00
  • f14c62f3d3 Merge pull request #12 from teamfisk/PlayerSystem Tobias Dahl 2015-12-11 17:15:00 +01:00
  • d406059c79 Small bugfix. Tleety 2015-12-11 17:00:06 +01:00
  • 59b261534a Cleaned some comments and random annoyances in Renderer Tleety 2015-12-11 16:57:02 +01:00
  • 9bd3da409d Added Font to ResourceManager viktorljung 2015-12-11 16:53:51 +01:00
  • 45b87ed6b1 ShaderProgram is now a Resource. Tleety 2015-12-11 16:53:46 +01:00
  • 55aad493ff Fixed warnings in OctTree. Cleaned unit tests. William Moberg 2015-12-11 16:45:38 +01:00
  • 9a7d77f29d Removed notes in OldOctTree. William Moberg 2015-12-11 16:44:49 +01:00
  • 36ae451ea6 Indentation stiffly 2015-12-11 16:22:14 +01:00
  • b3bb0e543f Added EventBroker Test from the other project verysecrethero 2015-12-11 16:17:23 +01:00
  • a8a38716bd Text renderer up and working, needs more work to be compatible with the ResourceManager and the Entity Component system viktorljung 2015-12-11 16:12:29 +01:00
  • 53d5736420 Fixed a bugg with RenderState. Tleety 2015-12-11 16:07:12 +01:00
  • 81034420a9 Put back old version of OctTree for testing, made unit tests. William Moberg 2015-12-11 16:04:30 +01:00
  • 15442c8c75 Merge branch 'PlayerSystem' into Networking stiffly 2015-12-11 15:45:27 +01:00
  • 3da69c8a1b Fixed indentation stiffly 2015-12-11 15:29:57 +01:00
  • 16d636a87c Removed Initialize function for systems. stiffly 2015-12-11 15:23:56 +01:00
  • 4da33ff4ec Fixed movement on a "player" cube. Very simple system atm stiffly 2015-12-11 15:00:57 +01:00
  • c2435fda2d Added Component to Components.xsd and Entity.xsd stiffly 2015-12-11 14:27:54 +01:00