Commit Graph

  • 069a6756b9 LightcullingPass for forward+ is now separate from Renderer.cpp. Tleety 2015-12-18 14:31:16 +01:00
  • a550b6077e Re-enabled InputCommand debugging info in console stiffly 2015-12-18 14:25:55 +01:00
  • e0cc25dbac Fixed the OctTreeTestGameClass.cpp so it draws the OctTree nicely again verysecrethero 2015-12-18 14:22:57 +01:00
  • 00bc55370d Added error check in Collision.cpp stiffly 2015-12-18 14:19:28 +01:00
  • 330f08b926 Merge remote-tracking branch 'origin/master' into Networking stiffly 2015-12-18 14:18:53 +01:00
  • a0255f1b31 Now uses config file to determine if client or server should be started. stiffly 2015-12-18 13:34:21 +01:00
  • ef4cbfece8 Added PointLight Component in XML files viktorljung 2015-12-18 13:20:55 +01:00
  • ab6af30a28 Base classes for decoupled forward+ renderer and a fix where if you had to many lights in a tile(200-300+) the list would fill up before the end of frustums. Tleety 2015-12-18 12:02:02 +01:00
  • a858dab8b6 Network not longer threaded stiffly 2015-12-18 12:00:14 +01:00
  • b1ae96f737 Merge remote-tracking branch 'origin/master' into AndersTest verysecrethero 2015-12-18 11:57:21 +01:00
  • 7dcd75fccc Merge pull request #18 from teamfisk/OctTree Jace 2015-12-18 11:42:44 +01:00
  • 1e5e24a036 The tests seems to work under boost 1.59 but test explorer window is broken in 1.60. also changed ResourceManagerTest.cpp verysecrethero 2015-12-18 11:37:02 +01:00
  • 3636ad45af Changed to correct branch viktorljung 2015-12-18 11:29:11 +01:00
  • 6d649e4d35 Merge remote-tracking branch 'origin/Networking' into Networking stiffly 2015-12-18 11:26:48 +01:00
  • 5c1a93021b Client now reads address and port from config file. Default address is set to local host. stiffly 2015-12-18 11:22:13 +01:00
  • 6cf7c12d34 Forward+ working RendererDecoupling viktorljung 2015-12-18 11:09:54 +01:00
  • ad43cc44c3 Merge remote-tracking branch 'origin/Networking' into Networking Jocke 2015-12-18 11:03:21 +01:00
  • 002e1d8c5a Removed magic number from Packet constructor in Packet.cpp. Jocke 2015-12-18 10:52:46 +01:00
  • 30db0b10fd Removed NetworkDefinitions.h and moved #define MAXCONNECTIONS 8 Jocke 2015-12-18 10:36:14 +01:00
  • 97f8be1915 Made Network.h's Start() and Update pure virtual and removed cpp. Jocke 2015-12-18 10:21:56 +01:00
  • 0eb51a0fea Merge remote-tracking branch 'origin/Networking' into Networking Jocke 2015-12-18 10:16:31 +01:00
  • 509a989d3b Merge branch 'MayaExporter' of github.com:teamfisk/TacticalZ into MayaExporter Teejoon 2015-12-18 10:07:44 +01:00
  • bc4cc5db54 Changed how we get skeletons. Made so that we could get the bind pose for each skeleton in the scene Teejoon 2015-12-18 10:03:00 +01:00
  • 13f7fb2561 Stashed test fixes for boost 1.6 verysecrethero 2015-12-18 10:01:05 +01:00
  • 0b714e593f Removed WinLeakCheck. Minor variable name changes. removed IsWASDKeyDown struct stiffly 2015-12-17 17:56:15 +01:00
  • 4a817613e3 Forward+ semi working viktorljung 2015-12-17 17:55:44 +01:00
  • 8beddca89a Merge remote-tracking branch 'origin/master' into AndersTest verysecrethero 2015-12-17 17:48:28 +01:00
  • 5e0fe975f3 Small error handling check. William Moberg 2015-12-17 17:48:00 +01:00
  • db5b6ad519 Added more error code to Packet class Jocke 2015-12-17 17:32:49 +01:00
  • a26c8f2a24 Merge branch 'master' into OctTree William Moberg 2015-12-17 17:30:44 +01:00
  • 076030a252 Fixes, mostly name changes stiffly 2015-12-17 17:28:43 +01:00
  • 0f59b863ee Renamed IF_DEBUG_IS to DEBUG_IF, slightly different behavior and added some safety checking for auto creating AABBs from models. William Moberg 2015-12-17 17:08:47 +01:00
  • d0927373a3 Merge pull request #20 from teamfisk/Editor EditorDemo Adam Byléhn 2015-12-17 16:51:59 +01:00
  • 46ae2d39af Merge branch 'master' into OctTree William Moberg 2015-12-17 16:44:01 +01:00
  • e9128efd13 Translation widget planes Editor Jace 2015-12-17 14:26:20 +01:00
  • 00f6056f7c Uniform scaling when dragging scaling widget origin Jace 2015-12-17 14:16:08 +01:00
  • a655f0bae5 Drag-and-drop asset picking and base work for showing component field tooltips in the editor Jace 2015-12-17 13:28:31 +01:00
  • cf6dde6c09 Boost dependency updated to version 1.60! Jace 2015-12-17 13:26:55 +01:00
  • c1b9404e52 Created a FileDropped event for when a file is dropped onto the client by the OS Jace 2015-12-17 13:26:12 +01:00
  • 8000654005 Model loading now fetches material opacity value properly Jace 2015-12-17 15:28:05 +01:00
  • 73708ec706 You can now add/remove animation clips. antc13 2015-12-17 14:58:46 +01:00
  • 000adb198f Reset RenderQueueFactory.cpp to original state stiffly 2015-12-17 14:36:36 +01:00
  • 51a2da9cc0 Removed old Event that is not used stiffly 2015-12-17 14:28:17 +01:00
  • 0f0a1ceca7 No more fake packet loss stiffly 2015-12-17 14:22:31 +01:00
  • 50822d09fc Merge remote-tracking branch 'origin/master' into Networking stiffly 2015-12-17 14:10:02 +01:00
  • 3e2ffdb85b Fixed comment on Trigger events. William Moberg 2015-12-17 13:48:35 +01:00
  • 5160a45b44 Made Ray into a class with checks so the direction will always be normalized. William Moberg 2015-12-17 13:41:34 +01:00
  • 03d5f0dd67 Added an macro IF_DEBUG_IS(x) that executes if run in debug mode, AABB has a check so max and min corners are set properly in debug mode. William Moberg 2015-12-17 13:31:54 +01:00
  • 4bb4e29515 More cleaning code stiffly 2015-12-17 13:23:15 +01:00
  • a6a08f48bb Merge remote-tracking branch 'origin/Networking' into Networking stiffly 2015-12-17 11:24:34 +01:00
  • aeca1dec18 Merge remote-tracking branch 'origin/master' into Rendering viktorljung 2015-12-17 11:17:58 +01:00
  • 0f1b06f74e Fixed camera rotation bug viktorljung 2015-12-17 11:13:34 +01:00
  • ba831f8a3c WIP Cleaning stiffly 2015-12-17 10:59:55 +01:00
  • 1a9b765d47 Merge pull request #17 from teamfisk/Editor Tobias Dahl 2015-12-17 10:59:08 +01:00
  • c8460e0a6c It's no use Jace 2015-12-17 10:55:54 +01:00
  • 4c29e071af Cleaned code stiffly 2015-12-17 10:47:08 +01:00
  • b87f559291 Updated default configs with editor stuff Jace 2015-12-17 10:46:49 +01:00
  • d4f5856304 Component attributes no longer get set on the wrong entity when switching selection while editing a field Jace 2015-12-17 10:44:34 +01:00
  • 6a3c14540d fixes viktorljung 2015-12-17 10:38:13 +01:00
  • 2cb5441b1c Merge remote-tracking branch 'origin/Networking' into Networking Jocke 2015-12-17 09:47:15 +01:00
  • 97a0d97b0b Can now send transform components. stiffly 2015-12-16 17:56:44 +01:00
  • 26d6f4c7cf Live texturing, fixed so Maya wont crash when the plugin is unloaded and Photoshop not being able to read the file under specific circumstances. maqu14 2015-12-16 17:45:20 +01:00
  • a914a7f924 Switched to deps/master branch Jace 2015-12-16 17:22:35 +01:00
  • dbbbb7b4e7 Working rotations and translations relative to global and local space for children Jace 2015-12-16 17:20:56 +01:00
  • a23d69af9a Removed old relics from OctTree testing in OctTree. William Moberg 2015-12-16 17:08:55 +01:00
  • 425f3ca3dd Fixed "trying to read more than package size" warnings. Jocke 2015-12-16 16:49:18 +01:00
  • 6d1cbd928e Improved collision logic, still not perfect since it updates before PlayerSystem. William Moberg 2015-12-16 16:34:27 +01:00
  • 6da5fd1263 Restructured code and added bool to stop client from spamming Snapshots to a server when Jocke 2015-12-16 15:47:51 +01:00
  • 6eebce05af Merge remote-tracking branch 'origin/Networking' into Networking Jocke 2015-12-16 14:58:36 +01:00
  • 58a9d38e26 Added a class that client and server inherits from. Jocke 2015-12-16 14:56:53 +01:00
  • 50ccf96268 Movement code not buggy anymore. Also changed package to not allocate more data than needed. ResetPoint stiffly 2015-12-16 13:52:16 +01:00
  • 5602b32507 Forward+ Fixes viktorljung 2015-12-16 13:36:38 +01:00
  • cf0ff9bfe5 Simple quickly made CollisionSystem. William Moberg 2015-12-16 12:23:08 +01:00
  • d10df6ae09 TriggerSystem implemented and working. William Moberg 2015-12-16 12:22:15 +01:00
  • 99b76d7ae1 Fixed returning address to temporary in functions. AABB also constructible from glm::vec4s. William Moberg 2015-12-16 12:19:43 +01:00
  • 661532e355 Slightly more usable entity tree Jace 2015-12-16 12:05:55 +01:00
  • bd6adcc157 Added SetParent to World Jace 2015-12-16 12:05:31 +01:00
  • 67017fcaf4 Stepping through the timeline. antc13 2015-12-16 11:33:42 +01:00
  • a2d55feed1 Merge remote-tracking branch 'origin/Networking' into Networking stiffly 2015-12-16 11:12:15 +01:00
  • e74b2b6874 Made it easier for non network members to create packages and extract information from them by addin PopFrontString() and PopFrontPrimitive<type>(). Jocke 2015-12-16 10:40:40 +01:00
  • 322aedaf72 Basic transformation widgets Jace 2015-12-15 18:01:20 +01:00
  • 3f602c9d63 Test code stiffly 2015-12-15 17:55:08 +01:00
  • 082b3fd3df Removed old input events from client stiffly 2015-12-15 17:22:46 +01:00
  • 04a01104b5 Merge branch 'master' into OctTree William Moberg 2015-12-15 17:11:11 +01:00
  • 9b348a7d97 Updated movement code once again. stiffly 2015-12-15 16:50:59 +01:00
  • 889e0bb3d3 Cleaned up PlayerSystem. Sets velocity to 0 every frame. stiffly 2015-12-15 16:35:09 +01:00
  • 1669649186 Fixed bug with entityID. Also trying to fix movement WIP. stiffly 2015-12-15 16:24:09 +01:00
  • 498afb3a5e Merge branch 'MayaExporter' of https://github.com/teamfisk/TacticalZ into MayaExporter antc13 2015-12-15 15:41:18 +01:00
  • 1431bd1a11 DebugChanges Tleety 2015-12-15 15:39:23 +01:00
  • ed82a0939a Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree William Moberg 2015-12-15 15:37:14 +01:00
  • e2417be8c7 Very simple CollisionSystem made, 'Z','Y' to toggle on/off. William Moberg 2015-12-15 15:36:28 +01:00
  • 472a8db81a Various bug fixes. stiffly 2015-12-15 15:32:31 +01:00
  • fa66e9ff47 Camera Switch event now working, Camera models Rotation still bugged viktorljung 2015-12-15 15:29:19 +01:00
  • 1e370bac13 ForwardPlus base debug commit. Tleety 2015-12-15 15:28:37 +01:00
  • 4e535c1102 File Writer WIP. Rework soon™ antc13 2015-12-15 15:24:46 +01:00
  • e940c1d604 WIP Jocke 2015-12-15 14:55:56 +01:00
  • 478c692315 Refactoring. Client and server has Update Loop that runs before any game logic each frame. stiffly 2015-12-15 14:53:56 +01:00
  • 170610bcb1 Added a TriggerSystem, seems to work as intended. William Moberg 2015-12-15 14:49:52 +01:00
  • 454ed0032b Refactored some RayVsModel tests verysecrethero 2015-12-15 14:01:49 +01:00
  • 1910ab705b AndersTest misc small mergefixes verysecrethero 2015-12-15 13:48:14 +01:00