Commit Graph

  • 433331e752 DrawPass now moved to it's own class to make renderer cleaner. Tleety 2015-12-11 14:22:54 +01:00
  • 094c7fbb44 Added system to CMakeLists.txt. stiffly 2015-12-11 14:20:36 +01:00
  • 0b60979c7b Added a Initialize function for systems. stiffly 2015-12-11 14:03:00 +01:00
  • 2366cd3520 Merge remote-tracking branch 'origin/master' into RendererDecoupling Tleety 2015-12-11 13:52:41 +01:00
  • 725a8896ce PickingPass now publishes an event that others can listen to to get pickingdata. Tleety 2015-12-11 13:51:08 +01:00
  • 350038057d Misc OctTreeTest changes verysecrethero 2015-12-11 13:51:07 +01:00
  • 80f028edf2 Added a very basic PlayerSystem, and a PlayerComponent. stiffly 2015-12-11 13:45:19 +01:00
  • 23c3f0709b Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking Jocke 2015-12-11 11:59:22 +01:00
  • 01d7388f91 Reactored the package loss logic. Jocke 2015-12-11 11:55:23 +01:00
  • 8f007f6daf Added Freetype 2.62 config and option files viktorljung 2015-12-11 11:26:41 +01:00
  • 8c563a2d76 Merge remote-tracking branch 'origin/Picking' into RendererDecoupling Tleety 2015-12-11 11:21:58 +01:00
  • 91edab34bc PickingPass now sets state and clear it when done. Tleety 2015-12-11 11:18:30 +01:00
  • 4c2ce3882e Added fonts folder and font viktorljung 2015-12-11 11:07:22 +01:00
  • 7b6902eafe Merge remote-tracking branch 'origin/master' into TextRendering viktorljung 2015-12-11 10:55:10 +01:00
  • 46854a63dd Text rendering includes viktorljung 2015-12-11 10:54:52 +01:00
  • 13a6cf5a9b Groundwork for Steam Controller support SteamController Jace 2015-12-11 00:41:51 +01:00
  • b4df0c49ae Groundwork for input command proxy Jace 2015-12-11 00:37:48 +01:00
  • 1ceea91f4a Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree verysecrethero 2015-12-10 18:02:03 +01:00
  • 4195baa5dc ContainedObject in OctTree made private. William Moberg 2015-12-10 17:57:09 +01:00
  • 37f9ab2322 Quick fix for unit test compilation. William Moberg 2015-12-10 17:53:33 +01:00
  • d8b1f4e514 ConfigFileTest attempt to explore the memleaks further verysecrethero 2015-12-10 17:46:17 +01:00
  • 6a3335315a Merge branch 'master' into Networking stiffly 2015-12-10 17:26:01 +01:00
  • 6326a60a79 Merge pull request #11 from teamfisk/Picking Jace 2015-12-10 17:24:12 +01:00
  • c651face4c ConfigFile now has tests covering the whole class verysecrethero 2015-12-10 17:20:47 +01:00
  • 641a43b2ec Merge remote-tracking branch 'origin/Networking' into Networking stiffly 2015-12-10 17:16:22 +01:00
  • 58952725e9 Added class Package to help refactor the code. The code got easier to read. stiffly 2015-12-10 17:07:18 +01:00
  • de044dabd3 Added ConfigFileTests! verysecrethero 2015-12-10 16:55:28 +01:00
  • ce7b26ccac Merge branch 'master' into OctTree William Moberg 2015-12-10 16:37:55 +01:00
  • bb900c5110 Added picking event viktorljung 2015-12-10 16:33:33 +01:00
  • cefc4e5257 PickingPassState done. Tleety 2015-12-10 16:06:25 +01:00
  • 0d8f7acb7e OctTree doesn't check the same object multiple times if it exists in multiple places in the tree. William Moberg 2015-12-10 16:04:55 +01:00
  • 37cf42527b RenderState class structure made. Tleety 2015-12-10 16:03:48 +01:00
  • 99543a300d Merge remote-tracking branch 'origin/Networking' into Networking Jocke 2015-12-10 14:39:01 +01:00
  • f377d9ba70 Fixed client movement. Jocke 2015-12-10 14:14:36 +01:00
  • d22e59f28f Merge remote-tracking branch 'origin/master' into Networking stiffly 2015-12-10 13:53:18 +01:00
  • 7804d42fea OctTree debug temporarily disabled because of the new master layout verysecrethero 2015-12-10 13:42:39 +01:00
  • 9a8f5293af Can now Identify Packet Loss. Enumerated messages that loops around 0-1000. stiffly 2015-12-10 12:55:28 +01:00
  • e535f629bc Merge branch 'master' into PlayerTakeCapturePoint verysecrethero 2015-12-10 11:50:29 +01:00
  • aa805f9a41 Merge remote-tracking branch 'origin/master' into Picking viktorljung 2015-12-10 11:38:35 +01:00
  • dc66891d60 Added Freetype 2.62 viktorljung 2015-12-10 11:22:56 +01:00
  • a22d086e60 Tested some of the Material Code. Seems to work. The project should now be following the code standard properly (hopefully). antc13 2015-12-10 11:18:34 +01:00
  • c60e968836 Removed a boxclear in the end of the test2 method verysecrethero 2015-12-10 11:03:40 +01:00
  • 9d3313e3ed Calculate frustrum removed from code untill Nvidia isn't shit. Tleety 2015-12-10 10:46:27 +01:00
  • dc4f5ad26e Merge pull request #9 from teamfisk/ecs-systems Jace 2015-12-10 10:42:37 +01:00
  • eaca1c4dd1 Merge pull request #7 from teamfisk/ecs Viktor Ljung 2015-12-10 10:32:00 +01:00
  • 0367826f16 Added RaptorCopter example system sippeangelo 2015-12-10 10:17:18 +01:00
  • 352074da04 Created base for systems sippeangelo 2015-12-10 10:17:08 +01:00
  • 53ef749736 Fixed absoute positioning, I think... sippeangelo 2015-12-10 10:15:14 +01:00
  • bc8a922b77 Merging octTreeTests a bit verysecrethero 2015-12-09 17:57:32 +01:00
  • 663aca2641 Moved client and server from header. Jocke 2015-12-09 17:50:30 +01:00
  • 4de613814b WIP Packet loss identification. Put packetID in message stiffly 2015-12-09 17:43:36 +01:00
  • de6e74c0b1 Forward+ Debugging commit, dont try it. Tleety 2015-12-09 17:36:03 +01:00
  • e580540143 Made some optimizations in OctTree and added a unit test for BoxesInSameRegion. William Moberg 2015-12-09 17:16:11 +01:00
  • 90a79c702f Added crude absolute positioning when rendering sippeangelo 2015-12-09 15:26:49 +01:00
  • e513059522 This is the "working"(little buggy) PhotoShop to Maya connection. Teejoon 2015-12-09 15:11:53 +01:00
  • 393a774140 Framework for Forward+ renderer, Buggy. Tleety 2015-12-09 14:50:39 +01:00
  • 0807a7d0ae Fixed the bug where starting a server made the program crash on closing. Jocke 2015-12-09 14:43:43 +01:00
  • ba150a264c Fixed bug that cause the program to crash when closing if a server had been started. Jocke 2015-12-09 14:41:26 +01:00
  • 578018607a Moved decision of which map to load to Config.ini sippeangelo 2015-12-09 14:32:34 +01:00
  • 58d827f7d0 Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld sippeangelo 2015-12-09 14:25:41 +01:00
  • 3085ccdfbf Added temporary Release function to resource manager to be able to reload a resource sippeangelo 2015-12-09 14:23:49 +01:00
  • b650eb95df Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree verysecrethero 2015-12-09 13:57:22 +01:00
  • 8949db5456 Little more work with OctTreeTest verysecrethero 2015-12-09 13:56:59 +01:00
  • 14bcb7ea0d Added Update call in Game to test OctTree by using collision. William Moberg 2015-12-09 13:52:17 +01:00
  • 519178dfba Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree verysecrethero 2015-12-09 13:37:27 +01:00
  • 0e6353dd79 Fixed bug where closing glwindow as client crashed. Jocke 2015-12-09 13:37:02 +01:00
  • ed5cd392ab Further work in testing OctTree verysecrethero 2015-12-09 13:29:15 +01:00
  • bad42fae1c OctTree differentiates between static/dynamic objects now. Added a general BoxesInSameRegion method. William Moberg 2015-12-09 13:27:00 +01:00
  • 247ff09743 Smoother movement over network. Some refactoring on client side. Now uses EKeyUp to determine if a key is pressed. stiffly 2015-12-09 13:02:39 +01:00
  • c9b140bd6b Semi-working entity loading from XML files! sippeangelo 2015-12-09 11:59:58 +01:00
  • 74c1beed20 gitignore FakeShemp 2015-12-09 12:03:01 +01:00
  • c8cb0ee939 Grab all materials FakeShemp 2015-12-09 11:58:49 +01:00
  • 2a35c3055e Renamed NetworkDefines.h --> NetworkDefinitions.h stiffly 2015-12-09 11:08:57 +01:00
  • c9d1ba6cae EntityIDs should start at 1, because 0 is world sippeangelo 2015-12-09 11:07:46 +01:00
  • eb9c217eb4 3D picking float value error fixed. Tleety 2015-12-09 10:44:06 +01:00
  • ce41421dbb Added a "StartNetwork" bool to DefaultConfig. stiffly 2015-12-09 10:37:40 +01:00
  • 1d0810db10 OctTree is now drawn perfectly verysecrethero 2015-12-09 10:24:06 +01:00
  • c85bb2eef7 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree verysecrethero 2015-12-09 10:08:26 +01:00
  • 75402b0f93 Working on OctTree tests verysecrethero 2015-12-09 10:08:08 +01:00
  • d597c7e60e Cleaned up custom type conversion code Jace 2015-12-08 22:51:35 +01:00
  • 0dbe0fe48e Component definitions and default values loading from schema Jace 2015-12-08 21:38:52 +01:00
  • f83e217638 Bugfix. if-statement was incorrect stiffly 2015-12-08 18:35:30 +01:00
  • 58db7b755a Random bugfixes and cleanup. stiffly 2015-12-08 18:24:08 +01:00
  • 1e1ce4e127 Added Model component to schema sippeangelo 2015-12-08 18:21:24 +01:00
  • 9fbea18330 fixup! Merge remote-tracking branch 'origin/master' into ecs sippeangelo 2015-12-08 18:20:42 +01:00
  • f337305dee Merge remote-tracking branch 'origin/master' into ecs sippeangelo 2015-12-08 18:07:42 +01:00
  • d7de4fc694 Component definitions now loaded from schema. No default values yet. sippeangelo 2015-12-08 18:07:32 +01:00
  • a8c0a1f294 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking stiffly 2015-12-08 18:07:18 +01:00
  • 9f54a08536 Implemented new version of snapshot for 3D world. Also some cleanup. stiffly 2015-12-08 17:57:01 +01:00
  • 03bbe25a1e Fixed FindXerces.cmake sippeangelo 2015-12-08 17:42:59 +01:00
  • 24dada149f Cleaned up code in Client.h and Client.cpp. Jocke 2015-12-08 17:18:03 +01:00
  • a7fb77d998 OctTree can check if a box collides with a box in the OctTree. William Moberg 2015-12-08 17:12:58 +01:00
  • 32d2aa6a93 AABB can also be created with center position and its size. William Moberg 2015-12-08 17:01:50 +01:00
  • d1880754f5 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking Jocke 2015-12-08 16:42:32 +01:00
  • 27b44d2511 Input events for Client done. Instead of windows getAsyncKeyState(); stiffly 2015-12-08 16:41:48 +01:00
  • 94adaf8ae3 Added support for multiplayer. Jocke 2015-12-08 16:41:22 +01:00
  • 6dc5112c26 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking stiffly 2015-12-08 16:15:50 +01:00
  • e92119c99e WIP trying to get Eventsystem to work in client. stiffly 2015-12-08 16:13:53 +01:00
  • c48c9e1f86 Added leak check when using windows (WinLeakCheck.h). Jocke 2015-12-08 13:54:18 +01:00
  • 7ac2aaef15 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree verysecrethero 2015-12-08 11:16:34 +01:00