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

Commit Graph

  • 950f3f3cf7 Fixed last commit. Removed the wrong thing. stiffly 2016-01-27 15:43:40 +01:00
  • 788407b709 Made CollisionSystem aware of entities Jace 2016-01-27 15:42:50 +01:00
  • 0e70dc6fa3 Merge remote-tracking branch 'origin/master' into NormalSpecularMapping Tleety 2016-01-27 15:41:31 +01:00
  • 246f56c823 Removed brainless logic. stiffly 2016-01-27 15:40:01 +01:00
  • 44302bb0f3 Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component Tleety 2016-01-27 15:38:54 +01:00
  • 181017313d Made entity parser give more useful errors and fixed the errors that were while I was at it Jace 2016-01-27 15:12:34 +01:00
  • 6615fe9438 Enabled multithreaded build for MSVC Jace 2016-01-27 15:09:34 +01:00
  • 113448dbf0 Added DEBUG preprocessor definition in Debug and RelWithDebInfo mode Jace 2016-01-27 15:09:23 +01:00
  • 5cdf6db340 Modified HealthSystem so it actually publishes the DeathEvent. Modified EPlayerHealthPickup. Fixed 2 tests. Started work on PlayerDeathSystem verysecrethero 2016-01-27 14:46:45 +01:00
  • 5c9616d4af Fixed asset name Tleety 2016-01-27 13:55:23 +01:00
  • a954cbbf50 Normal map support Tleety 2016-01-27 13:52:27 +01:00
  • dec2234019 Merge branch 'Cleanup' Jace 2016-01-27 13:37:26 +01:00
  • 0334ec3fa7 Merge remote-tracking branch 'origin/Animations' Jace 2016-01-27 13:36:49 +01:00
  • 5fcd26cd3e Made TriggerSystem make use of Octree Jace 2016-01-27 13:35:16 +01:00
  • 8102f3a2ea Working transparency in most common cases. Transparency Tleety 2016-01-27 12:59:44 +01:00
  • 65e5729118 Added assets maqu14 2016-01-27 12:34:24 +01:00
  • cbb17d22d4 WIP Tleety 2016-01-27 12:10:00 +01:00
  • 8bed5194d8 "Proper" handling of conditional rendering of entities parented to camera or entities that should be hidden from the active local player perspective Jace 2016-01-27 11:36:24 +01:00
  • 90f05442aa Merge branch 'master' into BoxModelCollision William Moberg 2016-01-27 10:52:27 +01:00
  • eb42217885 Merge pull request #38 from teamfisk/CoolDeathAnimation Jace 2016-01-27 10:51:22 +01:00
  • 7e12d00874 Merge branch 'master' into CoolDeathAnimation CoolDeathAnimation Jace 2016-01-27 10:31:28 +01:00
  • 6ea490e215 Tried a horrible recursive method, extreme framedrop. William Moberg 2016-01-27 10:34:26 +01:00
  • 57a5cb58e1 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer antc13 2016-01-27 09:37:14 +01:00
  • c5b1afb0d4 Exporter Fix antc13 2016-01-27 09:37:01 +01:00
  • 7834087e75 WIP Cleanup Jace 2016-01-26 17:54:17 +01:00
  • 505a6c7396 Hiding first person models properly Pitch2 ShootRays AirJumpEffect Jace 2016-01-25 14:32:48 +01:00
  • 8866dd6054 Merge remote-tracking branch 'origin/Networking' into ShootRays Jace 2016-01-25 11:57:44 +01:00
  • b6fd18baed Hacked in serverside effects Jace 2016-01-25 11:56:40 +01:00
  • 4245264029 Weapon RayZ Jace 2016-01-25 10:25:44 +01:00
  • 3389b965eb Test on game level v1. William Moberg 2016-01-25 10:55:05 +01:00
  • d12246833e Some further small fizes to resolution //Tobias viktorljung 2016-01-25 01:26:41 +01:00
  • 44baa47bba Merge remote-tracking branch 'origin/master' into CoolDeathAnimation stiffly 2016-01-25 01:21:15 +01:00
  • b95c1fdfa4 Merge remote-tracking branch 'origin/Menu' Jace 2016-01-25 00:25:03 +01:00
  • 7b348379ac Quaternions are never the solution. Jace 2016-01-25 00:22:55 +01:00
  • 6aeb281249 Resolution fix in render stages //Tobias viktorljung 2016-01-25 00:07:17 +01:00
  • 04f6233d99 Crude animations Jace 2016-01-24 23:44:29 +01:00
  • d6cc1eaac4 Merge remote-tracking branch 'origin/Animations' Jace 2016-01-24 23:06:59 +01:00
  • d0de169613 Instagib! Jace 2016-01-24 23:05:52 +01:00
  • 79fe7693a6 picking values fixed viktorljung 2016-01-24 23:05:45 +01:00
  • b6ba8a5bd7 Network snapshot buffer size increased, needs to be looked over later Jace 2016-01-24 23:05:26 +01:00
  • f8b9606cdf Picking animation fix viktorljung 2016-01-24 22:59:53 +01:00
  • 84fddf02e2 Merge remote-tracking branch 'origin/master' into Animations viktorljung 2016-01-24 22:42:12 +01:00
  • d03b3fb071 Merge remote-tracking branch 'origin/master' into Menu viktorljung 2016-01-24 22:23:53 +01:00
  • 7e92d6f53f Healthbar on player viktorljung 2016-01-24 22:21:10 +01:00
  • 47d2fb6a9b Fixed wrong drawing function used in PickingPass Jace 2016-01-24 22:20:42 +01:00
  • 06f64f8fbf Added a player name to the PlayerSpawned event. When a player has spawned the server sends the name to the client which publishes the event. stiffly 2016-01-24 22:00:38 +01:00
  • 0c56a05144 Merge branch 'master' of github.com:teamfisk/TacticalZ Jace 2016-01-24 21:21:51 +01:00
  • 382eff169f Server refactoring to remove player dependency and lots of fixes. Jace 2016-01-24 21:20:43 +01:00
  • 0c557317a9 Merge remote-tracking branch 'origin/master' into Menu viktorljung 2016-01-24 21:16:05 +01:00
  • a304b00038 fixed crashes viktorljung 2016-01-24 21:12:41 +01:00
  • f1343e2f82 Collision may be working, kind of. William Moberg 2016-01-24 21:08:42 +01:00
  • d4797b0808 Some entity files Tleety 2016-01-24 21:08:01 +01:00
  • ada1bac2a7 Merge remote-tracking branch 'origin/master' into Menu viktorljung 2016-01-24 20:48:17 +01:00
  • 25890c8d6c Merge remote-tracking branch 'origin/Networking' Jace 2016-01-24 19:01:15 +01:00
  • 0fb1dbcae1 Client now has authority over its own absolute position and orientation until we have reliable input messaging Jace 2016-01-24 19:00:50 +01:00
  • 9f3d887ac4 Networking bugfixes Jace 2016-01-24 18:37:36 +01:00
  • b4081b3e45 Merge remote-tracking branch 'origin/Networking' Jace 2016-01-24 17:18:39 +01:00
  • 8cf9caf7aa AnimationSystem working viktorljung 2016-01-24 18:31:23 +01:00
  • 8d61632c26 No longer spawns a f**king sphere. stiffly 2016-01-24 17:40:43 +01:00
  • 2eaad2aa00 Client now responds to deleted entity and component in server stiffly 2016-01-24 17:15:26 +01:00
  • 235b26ad61 WIP shoot Jace 2016-01-24 17:16:18 +01:00
  • dd80323342 Merge remote-tracking branch 'origin/master' into Animations viktorljung 2016-01-24 17:06:34 +01:00
  • af2f017cb4 AnimationSystem base WIP viktorljung 2016-01-24 17:05:34 +01:00
  • f80fb5eda8 Merge pull request #52 from teamfisk/Importer Viktor Ljung 2016-01-24 17:05:02 +01:00
  • aa115befa9 UnitRaptor is now displayed while models are being loaded in. antc13 2016-01-24 17:04:12 +01:00
  • aa20b48188 Merge remote-tracking branch 'origin/master' into Importer antc13 2016-01-24 16:22:22 +01:00
  • 96a735c542 Changed .obj to .mesh for all meshes. antc13 2016-01-24 16:12:31 +01:00
  • 3261e21d96 Coloring players depending on team and created a blue spawn in MovementTest PlayerMovement Jace 2016-01-24 15:46:01 +01:00
  • c9dc9a3570 Merge branch 'master' into BoxModelCollision William Moberg 2016-01-24 15:38:38 +01:00
  • 910b3d10e4 WIP (false collisions), collision method expanded, not working. William Moberg 2016-01-24 15:32:10 +01:00
  • 666f1fd878 Removed temp variables & the "forced" animation in DrawFinalPass antc13 2016-01-24 15:30:20 +01:00
  • 373bb33cf0 Player jumping taking air acceleration into account Jace 2016-01-24 15:20:34 +01:00
  • 4c5d17b203 Merge remote-tracking branch 'origin/master' into Importer antc13 2016-01-24 14:40:52 +01:00
  • 8286d052b3 Changed color values from floats to glm::vec4 antc13 2016-01-24 14:18:04 +01:00
  • aaa11d2109 Merge remote-tracking branch 'origin/master' into PlayerMovement Jace 2016-01-24 14:18:23 +01:00
  • 67477ff3ae EEntityDeleted and EComponentDeleted events published by World Jace 2016-01-24 13:49:45 +01:00
  • aa3b8cd652 Fixed text color and removed debugging code viktorljung 2016-01-24 13:37:07 +01:00
  • b5b1140f5c Custom Animations should now work. We also save color values if there's no texture. antc13 2016-01-24 13:28:40 +01:00
  • 7567f47a68 Weapon system now searches parents for health component (stops at first health component). Jocke 2016-01-24 11:56:46 +01:00
  • 97d70f8e32 Fixed in client for shoot event. Weapon system now damages health on any target not only players. Jocke 2016-01-24 11:36:01 +01:00
  • 3baa988ad4 Changed .obj files to our own format. DummyScene.mesh may be broken. antc13 2016-01-23 20:35:58 +01:00
  • 1ce9128da8 Source-like movement Jace 2016-01-23 19:45:23 +01:00
  • a28748b35d Merge remote-tracking branch 'origin/master' into Networking stiffly 2016-01-23 18:42:16 +01:00
  • e6224a4e96 WIP (not working), attempt at separating axis theorem stuff. William Moberg 2016-01-23 18:31:27 +01:00
  • fcba0a28b8 Merge branch 'master' into Menu viktorljung 2016-01-23 18:27:48 +01:00
  • 132de88d28 Merge pull request #50 from teamfisk/Forward+ Viktor Ljung 2016-01-23 18:23:16 +01:00
  • df485ccf7b Merge branch 'master' into Forward+ Forward+ viktorljung 2016-01-23 18:21:35 +01:00
  • 85a4d98c81 Revert "Revert "Merge pull request #43 from teamfisk/Forward+"" viktorljung 2016-01-23 18:21:10 +01:00
  • ef020a3770 Text fixed viktorljung 2016-01-23 18:17:20 +01:00
  • 160b7183b2 WIP viktorljung 2016-01-23 18:07:07 +01:00
  • f1835fd89c Animations PROBABLY works fine if all joints got keyframes. antc13 2016-01-23 18:02:42 +01:00
  • ecdb5ed07d Merge remote-tracking branch 'origin/master' into Networking stiffly 2016-01-23 17:51:06 +01:00
  • 6eeb3ea524 WIP, Bug fix + nitpicks + optimizations. William Moberg 2016-01-23 17:50:35 +01:00
  • 5edf5a41f1 Transparency bug fix Tleety 2016-01-23 16:45:26 +01:00
  • 6d2c656a04 Merge remote-tracking branch 'origin/Networking' into Networking Jocke 2016-01-23 16:41:42 +01:00
  • 2bf0434bcb Remade Snapshot logic from component based to entity based. Jocke 2016-01-23 16:40:38 +01:00
  • ff6ec82a6c AMD fix viktorljung 2016-01-23 16:27:01 +01:00
  • bd62b5873d Revert "Merge pull request #43 from teamfisk/Forward+" viktorljung 2016-01-23 15:57:26 +01:00
  • aacfc47fb5 Merge remote-tracking branch 'origin/master' into Menu viktorljung 2016-01-23 15:12:19 +01:00
  • 666ef6589e Crouching! Jace 2016-01-23 15:06:47 +01:00