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

Commit Graph

  • f52cddb445 Added packet loss logic for multiple clients. Jocke 2016-01-20 13:43:11 +01:00
  • 78a1037983 WIP Tleety 2016-01-20 13:34:56 +01:00
  • 84b7cf165c Reduced the chance of crashing in Export. antc13 2016-01-20 11:46:32 +01:00
  • 85523343b2 Merge remote-tracking branch 'origin/master' into Networking stiffly 2016-01-20 10:24:53 +01:00
  • 386e76f642 Puyshing antc13 2016-01-20 09:49:54 +01:00
  • 410e349329 Added test map for capture points and some debug code. William Moberg 2016-01-19 18:27:58 +01:00
  • a47317bb32 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer antc13 2016-01-19 18:26:45 +01:00
  • e643581971 Commit in order to pull from Master. antc13 2016-01-19 18:21:27 +01:00
  • 3826142e94 Now supporting multiple material per mesh. Simon changed glDrawElementsBaseVertex to glDrawElements in DrawFinalPass.cpp Hallelulijah! antc13 2016-01-19 17:40:34 +01:00
  • ce27b224df Merge remote-tracking branch 'origin/master' into TextRendering viktorljung 2016-01-19 17:27:09 +01:00
  • b45de542da CapturePointSystem updated, all tests are green verysecrethero 2016-01-19 17:19:58 +01:00
  • f0763bc2a3 Font loading crash fixed viktorljung 2016-01-19 17:18:18 +01:00
  • d1b6fb1259 Tiny logic alteration so we don't get false warnings in debug. OctTree William Moberg 2016-01-19 16:59:02 +01:00
  • dfa96f74e1 Merge pull request #39 from teamfisk/Forward+ Joachim Pettersson 2016-01-19 16:53:07 +01:00
  • 5d6d0f82b9 Removed some debug code Tleety 2016-01-19 16:48:59 +01:00
  • a124ab2400 Some asset shit. Tleety 2016-01-19 16:11:56 +01:00
  • d2263b0c90 Assets added Tleety 2016-01-19 16:09:30 +01:00
  • a8ffb24040 latest commit fix Tleety 2016-01-19 16:08:09 +01:00
  • 893ef38237 Removed world from renderer and moved depth-calculation code to modeljob Tleety 2016-01-19 15:41:17 +01:00
  • f197993beb Changed CapturePointSystem in light of new enums in the components and a teamcomponent. Half the tests are currently working verysecrethero 2016-01-19 15:31:15 +01:00
  • 017ad96bbe Fixed some errors in Tests. William Moberg 2016-01-19 15:20:29 +01:00
  • ad9bb5fba4 Added an extra interpolation point. stiffly 2016-01-19 15:03:10 +01:00
  • 713ebbe18c Can add any objects that inherit from AABB into the Octree. William Moberg 2016-01-19 14:50:46 +01:00
  • 982837052a DirectionalLight now correctly getting directions Tleety 2016-01-19 14:44:17 +01:00
  • 8854794cbc fixup! Editor widget selection and creation Jace 2016-01-19 13:32:32 +01:00
  • e0c4394f20 Merge. Also fixed interpolation for scale and rotation. stiffly 2016-01-19 14:04:25 +01:00
  • 260203fa4d Annotation on physics component Jace 2016-01-19 13:28:16 +01:00
  • d030e8f699 Editor widget selection and creation Jace 2016-01-19 13:28:02 +01:00
  • 61984d2c4a Removed lots of slowing debug output from entity parsing pipeline Jace 2016-01-19 13:27:29 +01:00
  • cfe023cc1d Created ComponentInfo::EnumType which defines which native type to use for enums. Jace 2016-01-19 12:33:53 +01:00
  • 4cafb2fc4c Merge remote-tracking branch 'origin/master' into Forward+ Tleety 2016-01-19 12:33:08 +01:00
  • 46e17b7e0d Working directional light Tleety 2016-01-19 12:32:34 +01:00
  • a6445c65aa Fixed EntityParser to handle string enums properly. Jace 2016-01-19 12:15:20 +01:00
  • 162523d3ca Made EntityFileWriter store enums as strings instead of integer values to be resistant to enum value changes! Jace 2016-01-19 11:55:27 +01:00
  • dbe56280a6 Resolution fixed and Centered text viktorljung 2016-01-19 11:45:34 +01:00
  • 3fb975a8d9 Editor widget entities Jace 2016-01-19 11:44:03 +01:00
  • 267a60ef30 Better loading of editor toolbox icons Jace 2016-01-19 11:43:38 +01:00
  • 68af853a03 Editor entity naming Jace 2016-01-19 11:42:26 +01:00
  • 3142c701e3 WIP interpolating scale and orientation stiffly 2016-01-19 11:42:30 +01:00
  • b62e42567c Fixed editor enum selection Jace 2016-01-19 11:35:31 +01:00
  • 77e1dacb6f Merge Ayumiwii 2016-01-19 09:58:52 +01:00
  • 9e3dfff7b6 WIP world pausing Jace 2016-01-19 00:52:17 +01:00
  • 79eaa7364c Editor toolbox buttons Jace 2016-01-18 23:59:46 +01:00
  • 51979d7f0c Changed System to take World through constructor and store it instead, cause it makes more sense. Jace 2016-01-18 23:59:33 +01:00
  • 3fc44e944c Editor entity reparenting. Jace 2016-01-18 21:18:23 +01:00
  • 1760f9dfb1 Added inequality operator to EntityWrapper Jace 2016-01-18 21:17:24 +01:00
  • 2a3009212a Importing custom mesh without material. antc13 2016-01-18 19:37:55 +01:00
  • d4242bbead Editor entity create and delete. Jace 2016-01-18 19:26:00 +01:00
  • 631dd57eeb Editor entity import, save, delete, component attach, component delete. Jace 2016-01-18 18:55:19 +01:00
  • 9cb5f4bd2f Added a stats window Jace 2016-01-18 18:03:45 +01:00
  • 621d935d7a Octree returns correct boxes when testing along an axis by searching through the correct child subtrees. William Moberg 2016-01-18 18:24:11 +01:00
  • b2358a1854 Added bool in Physics to toggle gravity for entities. William Moberg 2016-01-18 18:16:24 +01:00
  • a6425160fd Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking stiffly 2016-01-18 18:13:19 +01:00
  • 88eb3ca2db Scraping queues for interpolation stiffly 2016-01-18 18:07:59 +01:00
  • 3e90ed564c Moved Struct in InterpolationSystem.h and fixed bug. Jocke 2016-01-18 18:07:39 +01:00
  • 4b29d48f27 WIP Tleety 2016-01-18 17:57:45 +01:00
  • c4594524da Better default values and documentation viktorljung 2016-01-18 17:51:17 +01:00
  • 2a93e2ae7f Merge remote-tracking branch 'origin/master' into TextRendering viktorljung 2016-01-18 17:44:26 +01:00
  • 14b1d541dc Merge remote-tracking branch 'origin/Networking' into Networking Jocke 2016-01-18 17:34:32 +01:00
  • 765509b510 Added interpolationsystem to pipeline. stiffly 2016-01-18 17:34:17 +01:00
  • 8952c1a7e4 Merge remote-tracking branch 'origin/Networking' into Networking Jocke 2016-01-18 17:28:09 +01:00
  • fc305f8bf4 Merge remote-tracking branch 'origin/Networking' into Networking Jocke 2016-01-18 17:13:10 +01:00
  • 62c3f72355 Fixed cmake for interpolationsystem. stiffly 2016-01-18 17:27:37 +01:00
  • 92553f1e93 text size can now be entered in the filepath with a comma separator, like this "filepath,16" viktorljung 2016-01-18 17:17:12 +01:00
  • 70cbb02cb2 Merge remote-tracking branch 'origin/Networking' into Networking Jocke 2016-01-18 17:13:10 +01:00
  • 0c7f2c5198 WIP implemented Interpolation (server logic) Jocke 2016-01-18 17:12:07 +01:00
  • d7780d8248 WIP implementing interpolation stiffly 2016-01-18 17:11:37 +01:00
  • 601ce85c05 WIP Tleety 2016-01-18 16:50:41 +01:00
  • 4c1a49a8a4 Merge remote-tracking branch 'origin/master' into CapturePointTake verysecrethero 2016-01-18 16:48:49 +01:00
  • 37aa1eaa18 Merge remote-tracking branch 'origin/master' into CoolDeathAnimation Ayumiwii 2016-01-18 16:02:43 +01:00
  • 01a164847c Directional light now fully added to all lists. Tleety 2016-01-18 15:15:33 +01:00
  • 794635b6a1 Added DirectionalLights to renderqueue jobs Tleety 2016-01-18 14:58:19 +01:00
  • 0a3b6f4da1 Added DirectionalLightJob Tleety 2016-01-18 14:57:55 +01:00
  • 3bc7dceca5 Made EntityWrapper hashable Jace 2016-01-18 14:55:49 +01:00
  • e0410d4345 Small logicfix in CapturePointSystem. Readded CapturePointSystem in Game. Added 2 tests. Tests have been refined a lot. verysecrethero 2016-01-18 14:41:16 +01:00
  • 6f1fd19ac7 Directional lights now being filled into m_LightSources Tleety 2016-01-18 14:30:28 +01:00
  • 6680f6863f DirectionalLight component added. Tleety 2016-01-18 14:30:22 +01:00
  • 1411964dcf hourglass assets fixed Ayumiwii 2016-01-18 14:24:31 +01:00
  • 4092f6b4d4 New Lightstruct working. Tleety 2016-01-18 14:20:28 +01:00
  • 35269315cc Rename the thingie Ayumiwii 2016-01-18 13:51:32 +01:00
  • 504f301e4d Added refactored property sheet for components Jace 2016-01-18 13:46:42 +01:00
  • bf3f8aea89 Merge pull request #36 from teamfisk/PlayerMovement William Moberg 2016-01-18 13:32:42 +01:00
  • 0669d91767 CollisionSystem loops over Collidable components. William Moberg 2016-01-18 13:29:10 +01:00
  • 942064c450 Removed class PlayerSystem and associated files. William Moberg 2016-01-18 13:07:04 +01:00
  • 8f8b64f99c First pass that actually work Ayumiwii 2016-01-18 11:50:00 +01:00
  • 6ba6deb863 Removed some debug spam. Jocke 2016-01-18 11:35:35 +01:00
  • cc604f8e9a Merge remote-tracking branch 'origin/Networking' into Networking stiffly 2016-01-18 11:06:51 +01:00
  • e97f4a3563 Merge remote-tracking branch 'origin/Networking' into Networking stiffly 2016-01-18 11:06:27 +01:00
  • d995713d3b Added input queue to Client and Input Listener debug code in server. Jocke 2016-01-18 11:05:32 +01:00
  • fb7e0498a8 Merge pull request #35 from teamfisk/DisableMemoryPool Jace 2016-01-18 10:46:53 +01:00
  • a346a329b3 Added an option to disable the Pool allocation in Config.ini, in case there is a mess with the MemoryPool. DisableMemoryPool William Moberg 2016-01-18 10:16:35 +01:00
  • e39e4064f2 Entity tree button mockup Jace 2016-01-17 23:06:32 +01:00
  • 0d50ede6f5 Base work on reimplementing editor GUI Jace 2016-01-17 07:34:20 +01:00
  • 4786986abd Rendering pipeline fixes across the board and base work on refactored editor Jace 2016-01-17 06:29:25 +01:00
  • e34856468a Removed DrawScenePass, since it doesn't seem to be used Jace 2016-01-17 06:27:45 +01:00
  • e2357b8625 Fixed absolute position not taking scale into account Jace 2016-01-17 06:23:13 +01:00
  • 6ec2258758 Added UniformScale component which keeps an entity's scale at a uniform value relative to the screen. Jace 2016-01-17 06:22:35 +01:00
  • 9f447afbdb Added EntityWrapper::Valid and bool overload to be check if an entity is valid and still exists in the world more easily Jace 2016-01-17 06:20:27 +01:00
  • f281d220de Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems. Jace 2016-01-17 01:00:48 +01:00
  • 6385a98eca Added runtime type size check to ComponentWrapper to avoid corruption when types don't match Jace 2016-01-17 00:53:31 +01:00