Commit Graph

  • ce89e6bc98 GameServer - Fixed some minor bugs, one that made server crash on exit. Also integrated some of GameLogics new API functions Dennis Andersen 2014-01-13 12:44:33 +0100
  • 792f78c34a GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char* lindaandersson 2014-01-13 12:11:45 +0100
  • 8ecd263318 Work asssignment split line Dander7BD 2014-01-13 10:25:20 +0100
  • 2b5a5b2fbd GameServer - Merge with gamelogic Dennis Andersen 2014-01-10 23:36:03 +0100
  • 059b3dd5e4 GameLogic - Basic game interface made (functions not yet implemented) Erik Persson 2014-01-10 12:33:04 +0100
  • f6ba81cd44 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic lindaandersson 2014-01-10 10:48:29 +0100
  • c541d032e7 GL - can move a obj on the client via the server lindaandersson 2014-01-10 10:47:54 +0100
  • 586031aa94 GameLogic - making sure GameLogic uses the new physics api Erik Persson 2014-01-10 10:08:42 +0100
  • 40892bfee5 Merge branch 'Network' of https://github.com/dean11/Danbias into GameServer Dennis Andersen 2014-01-10 09:28:32 +0100
  • e575fff610 Physics proj .. show all files should be set to false Dander7BD 2014-01-10 08:53:20 +0100
  • 7262535454 Added some more UML-stuff Dennis Andersen 2014-01-09 14:19:12 +0100
  • a02a32c029 Network now closes listener gracefully, meaning threads dont crash anymore, also fixed a minor bug in Game folder Dennis Andersen 2014-01-09 14:18:01 +0100
  • 52ba5602d5 GameLogic - player now using some of the new phys api Erik Persson 2014-01-09 13:06:18 +0100
  • 48b9189a03 Revert "state" Erik Persson 2014-01-09 12:51:17 +0100
  • 4a07586076 state Erik Persson 2014-01-09 12:43:32 +0100
  • 8b85d1f539 Bug fixing Dander7BD 2014-01-09 11:48:21 +0100
  • c13ed71cca post merge removed excess created files Dander7BD 2014-01-09 11:44:37 +0100
  • 938447879f post merge + minor edits Dander7BD 2014-01-09 11:36:55 +0100
  • c39e2fe791 Merge remote-tracking branch 'origin/PhysicsStructs' into Verifying-Gravity-struct Dander7BD 2014-01-09 11:03:25 +0100
  • 687ffa4f99 struct State::GetView() overload Dander7BD 2014-01-09 10:42:22 +0100
  • 0a3d68a407 Small bug fix and include new SSAO shader lanariel 2014-01-09 01:08:49 +0100
  • 42de421904 Master - Modified igore Dennis Andersen 2014-01-08 13:07:55 +0100
  • 73302bf171 Added UML-documents Dennis Andersen 2014-01-08 12:45:48 +0100
  • 7c567ec360 SSAO and frame counter lanariel 2014-01-08 07:01:59 +0100
  • ed202a15a2 Worked over the holidays Dennis Andersen 2014-01-07 10:26:09 +0100
  • 4925256fd1 Added .orig to ignore Dennis Andersen 2013-12-21 23:41:55 +0100
  • 3890293b03 Added .orig to ignore Dennis Andersen 2013-12-21 23:38:40 +0100
  • 578d0a8533 Added .pdb and .cso to git ignore Dennis Andersen 2013-12-21 21:56:46 +0100
  • 0065779205 Added comments where the physic generated errors due to big patch Dennis Andersen 2013-12-21 17:37:30 +0100
  • fba52398c3 Merge remote-tracking branch 'origin/Physics' into Sprint2 Dander7BD 2013-12-20 12:18:30 +0100
  • 4d3032dc81 postmerge compile error fix Dander7BD 2013-12-20 12:13:12 +0100
  • ca90b3ae3b OnPossibleCollision updated Dander7BD 2013-12-20 11:44:27 +0100
  • a440cffb0e Added function to get delta time Robin Engman 2013-12-20 11:43:12 +0100
  • 66e93fbdae SimpleRigid functions mirrored in SphericalRigid Robin Engman 2013-12-20 11:36:39 +0100
  • ec0f0e0d14 SimpleRigidBody::Predict(..) added Dander7BD 2013-12-20 11:30:11 +0100
  • d163b7d8cf Partial SimpleRigidBody update end Dander7BD 2013-12-20 11:21:18 +0100
  • 9a67e7ef3d RigidBody::Move(..) added Dander7BD 2013-12-20 11:19:07 +0100
  • 604a17056c Partial SimpleRigid update Dander7BD 2013-12-20 11:15:43 +0100
  • c4bbc09a97 CustomBodyState::ApplyForwarding(..) added Dander7BD 2013-12-20 11:13:44 +0100
  • 9aa584acc7 RigidBody::Predict_Leapfrog(..) added Dander7BD 2013-12-20 10:55:04 +0100
  • ec9f2379c7 Minor bug fixes in math librrary Dander7BD 2013-12-19 22:06:48 +0100
  • bbc489eac9 RigidBody improved and Gimbal lock proofed Dander7BD 2013-12-19 21:39:20 +0100
  • ff52977dcf Bug fixes Dander7BD 2013-12-19 17:27:09 +0100
  • 461fecd1d2 Bug fixing Dander7BD 2013-12-19 14:01:02 +0100
  • 9b9e549a5e bug fix in bool Intersect( const Box &box, const Sphere &sphere, Float4 &worldPointOfContact ) Dander7BD 2013-12-19 11:57:03 +0100
  • 840f000ec9 Bug fix in API_Impl OnPossibleCollision(...) Dander7BD 2013-12-19 11:28:30 +0100
  • 4ebb8cd9b8 Minor edit in CustomBodyState Dander7BD 2013-12-19 11:22:20 +0100
  • 4e21e2b0c0 Renamed Formula::CollisionResponse::Impulse to.. Dander7BD 2013-12-19 11:21:49 +0100
  • 24418603ad ICustomBody::GetNormal returns Float4::null if.. Dander7BD 2013-12-19 11:21:14 +0100
  • 76c83add3d Added sanity check to SphericalRigidBody::GetNormalAt Dander7BD 2013-12-19 11:15:49 +0100
  • 42418257cb CustomBodies now aware of it's scene Dander7BD 2013-12-19 10:53:55 +0100
  • 59d5a3dc1e Created function for friction Robin Engman 2013-12-19 10:15:32 +0100
  • 9cee69edd6 Extended friction content of the ICustomBody::State struct Dander7BD 2013-12-19 10:03:56 +0100
  • 56dec6cf5d Added "alpha" friction Robin Engman 2013-12-19 08:34:16 +0100
  • 09e55ddc30 SimpleRigidBody::GetNormalAt Done Dander7BD 2013-12-18 14:49:47 +0100
  • 5051a9e767 Major StateStruct and API update Dander7BD 2013-12-18 14:16:13 +0100
  • 96bf20e5ae compile errors fixed Dander7BD 2013-12-18 09:25:04 +0100
  • dbb0c38432 Big patch Dander7BD 2013-12-18 08:57:27 +0100
  • 9cdbe2c861 Added algorithms for collision stubs Robin Engman 2013-12-18 08:57:10 +0100
  • e8952dc739 CollideAble implementations updated Dander7BD 2013-12-17 14:14:54 +0100
  • 632570f66b Updated the BoxVsBox collision alghorithm Dander7BD 2013-12-17 12:27:23 +0100
  • a03568e19e Updated formula for BoxVsBox point of contact Dander7BD 2013-12-17 12:09:20 +0100
  • ec6cd72f3c SeperatingAxisTest_AxisAlignedVsTransformedBox overloaded Dander7BD 2013-12-16 13:33:33 +0100
  • 4858f573e6 Added more collision subs Dander7BD 2013-12-16 10:31:26 +0100
  • d8b323e230 Extractable collision point for SphereVSSphere Robin Engman 2013-12-16 10:28:49 +0100
  • a3ced24fea Some compile error fixes Dander7BD 2013-12-16 10:03:29 +0100
  • 61e1d20748 Fixed const problem Robin Engman 2013-12-16 09:55:59 +0100
  • 5f305b7086 Oops Robin Engman 2013-12-16 09:38:38 +0100
  • 283633c6c6 Added stub functions Robin Engman 2013-12-16 09:38:04 +0100
  • de0078265c Stub response to new ICollideAble method Dander7BD 2013-12-16 09:36:41 +0100
  • da996a5deb Added cirtual function to ICollideAble Dander7BD 2013-12-16 09:06:10 +0100
  • c854b1af58 Stuff Dander7BD 2013-12-16 08:58:15 +0100
  • 15dc962709 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2013-12-20 11:40:07 +0100
  • 59ba530761 GL - merge error Linda Andersson 2013-12-20 11:27:49 +0100
  • 16715f3f2a GL - push before merge Linda Andersson 2013-12-20 11:27:04 +0100
  • d3721fcada last updates Erik Persson 2013-12-20 11:10:36 +0100
  • be39365a27 Gamelogic - Merged with existing stuff Dennis Andersen 2013-12-20 09:47:24 +0100
  • 15d6ac8cf9 GameLogic - Final sprint2 merge Dennis Andersen 2013-12-20 09:42:02 +0100
  • ea5fc78817 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2013-12-20 09:04:30 +0100
  • 606cb10f8b GL - removed server include from gameLancher Linda Andersson 2013-12-20 09:04:18 +0100
  • f4232ca0b4 gamplay code in gamesession Erik Persson 2013-12-20 08:59:46 +0100
  • 694d5576d7 GameLogic - Pre-merge with physics Dennis Andersen 2013-12-19 15:35:49 +0100
  • ecf1c5fc36 GL - delete timer Linda Andersson 2013-12-19 14:32:52 +0100
  • 855860d454 Gravity struct Tobias Grundel 2013-12-19 14:30:16 +0100
  • ea59c25119 GL - mergeing error Linda Andersson 2013-12-19 13:49:46 +0100
  • bb61b83392 GL - merge Linda Andersson 2013-12-19 13:46:01 +0100
  • d68fd63b25 Added server launcher Dennis Andersen 2013-12-19 13:35:56 +0100
  • 0570d76e24 Modified part of some player states Dennis Andersen 2013-12-19 12:41:37 +0100
  • 934aa6e45a Merge Dennis Andersen 2013-12-19 12:34:59 +0100
  • beb116e964 Fixed some threafing and stuff Dennis Andersen 2013-12-19 12:32:23 +0100
  • 27aad0d86f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2013-12-19 11:58:54 +0100
  • ba6f7114b5 GL - added id in object, vector Linda Andersson 2013-12-19 11:58:42 +0100
  • e68001da0e testing updated Erik Persson 2013-12-19 11:46:11 +0100
  • 057dce0aca GL - merge errors Linda Andersson 2013-12-19 10:31:59 +0100
  • 13430f31fc GL - merge and some more protocols Linda Andersson 2013-12-19 10:22:32 +0100
  • 0ea08fbd54 gamesession testing Erik Persson 2013-12-19 10:21:03 +0100
  • 341e33ee78 Rebased Lights to Use World Coordinates lanariel 2013-12-18 20:36:41 +0100
  • 3139585e7b Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics lanariel 2013-12-18 20:29:24 +0100
  • 718b1ade2b Proper Lighting, supports Multiple Lights lanariel 2013-12-18 20:28:06 +0100
  • a4907c8e2e GL - control protocol added Linda Andersson 2013-12-18 15:28:47 +0100