NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,002 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

1002 Commits

Author SHA1 Message Date
Dennis Andersen 2b5a5b2fbd GameServer - Merge with gamelogic 2014-01-10 23:36:03 +01:00
Erik Persson 059b3dd5e4 GameLogic - Basic game interface made (functions not yet implemented) 2014-01-10 12:33:15 +01:00
lindaandersson f6ba81cd44 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-10 10:48:29 +01:00
lindaandersson c541d032e7 GL - can move a obj on the client via the server 2014-01-10 10:47:54 +01:00
Erik Persson 586031aa94 GameLogic - making sure GameLogic uses the new physics api 2014-01-10 10:08:42 +01:00
Dennis Andersen 40892bfee5 Merge branch 'Network' of https://github.com/dean11/Danbias into GameServer 2014-01-10 09:28:32 +01:00
Dander7BD e575fff610 Physics proj .. show all files should be set to false 
That is how we in Physics rolls
 2014-01-10 08:53:20 +01:00
Dennis Andersen 7262535454 Added some more UML-stuff 2014-01-09 14:19:12 +01:00
Dennis Andersen a02a32c029 Network now closes listener gracefully, meaning threads dont crash anymore, also fixed a minor bug in Game folder 2014-01-09 14:18:01 +01:00
Erik Persson 52ba5602d5 GameLogic - player now using some of the new phys api 2014-01-09 13:06:18 +01:00
Erik Persson 48b9189a03 Revert "state" 
This reverts commit 4a07586076.
 2014-01-09 12:51:17 +01:00
Erik Persson 4a07586076 state 2014-01-09 12:43:32 +01:00
Dander7BD 8b85d1f539 Bug fixing 2014-01-09 11:48:21 +01:00
Dander7BD c13ed71cca post merge removed excess created files 
Gravity struct commit brought excess junk files
 2014-01-09 11:44:37 +01:00
Dander7BD 938447879f post merge + minor edits 
derepetifified code in struct Gravity
and some cosmetic consistency edits.
 2014-01-09 11:36:55 +01:00
Dander7BD c39e2fe791 Merge remote-tracking branch 'origin/PhysicsStructs' into Verifying-Gravity-struct 
Conflicts:
	Bin/Content/Shaders/LightPass.cso
	Code/GamePhysics/PhysicsStructs-Impl.h
 2014-01-09 11:03:25 +01:00
Dander7BD 687ffa4f99 struct State::GetView() overload 
Can now provide an offset vector as argument
 2014-01-09 10:42:22 +01:00
lanariel 0a3d68a407 Small bug fix and include new SSAO shader 2014-01-09 01:08:49 +01:00
Dennis Andersen 42de421904 Master - Modified igore 2014-01-08 13:07:55 +01:00
Dennis Andersen 73302bf171 Added UML-documents 2014-01-08 12:45:48 +01:00
lanariel 7c567ec360 SSAO and frame counter 2014-01-08 07:01:59 +01:00
Dennis Andersen ed202a15a2 Worked over the holidays 2014-01-07 10:26:09 +01:00
Dennis Andersen 4925256fd1 Added .orig to ignore 2013-12-21 23:41:55 +01:00
Dennis Andersen 3890293b03 Added .orig to ignore 2013-12-21 23:38:40 +01:00
Dennis Andersen 578d0a8533 Added .pdb and .cso to git ignore 2013-12-21 21:56:46 +01:00
Dennis Andersen 0065779205 Added comments where the physic generated errors due to big patch 2013-12-21 17:37:30 +01:00
Dander7BD fba52398c3 Merge remote-tracking branch 'origin/Physics' into Sprint2 2013-12-20 12:18:30 +01:00
Dander7BD 4d3032dc81 postmerge compile error fix 2013-12-20 12:13:12 +01:00
Dander7BD ca90b3ae3b OnPossibleCollision updated 2013-12-20 12:08:33 +01:00
Robin Engman a440cffb0e Added function to get delta time 
Now in local physics API
 2013-12-20 12:08:32 +01:00
Robin Engman 66e93fbdae SimpleRigid functions mirrored in SphericalRigid 
The functions added to SimpleRigidBody has been added to
SphericalRigidBody too.
 2013-12-20 12:08:31 +01:00
Dander7BD ec0f0e0d14 SimpleRigidBody::Predict(..) added 2013-12-20 12:08:30 +01:00
Dander7BD d163b7d8cf Partial SimpleRigidBody update end 2013-12-20 12:08:30 +01:00
Dander7BD 9a67e7ef3d RigidBody::Move(..) added 2013-12-20 12:08:29 +01:00
Dander7BD 604a17056c Partial SimpleRigid update 2013-12-20 12:08:28 +01:00
Dander7BD c4bbc09a97 CustomBodyState::ApplyForwarding(..) added 2013-12-20 12:08:28 +01:00
Dander7BD 9aa584acc7 RigidBody::Predict_Leapfrog(..) added 
needed for collision response rewinding/forwarding
 2013-12-20 12:08:27 +01:00
Dander7BD ec9f2379c7 Minor bug fixes in math librrary 2013-12-20 12:08:26 +01:00
Dander7BD bbc489eac9 RigidBody improved and Gimbal lock proofed 2013-12-20 12:08:25 +01:00
Dander7BD ff52977dcf Bug fixes 
including a hack
 2013-12-20 12:08:24 +01:00
Dander7BD 461fecd1d2 Bug fixing 
SimpleRigidBody::GetNormal returned wrong results.
Second bounce impulse in OnPossibleCollision, should be subtracted
instead of added.
 2013-12-20 12:08:24 +01:00
Dander7BD 9b9e549a5e bug fix in bool Intersect( const Box &box, const Sphere &sphere, Float4 &worldPointOfContact ) 2013-12-20 12:08:22 +01:00
Dander7BD 840f000ec9 Bug fix in API_Impl OnPossibleCollision(...) 2013-12-20 12:08:22 +01:00
Dander7BD 4ebb8cd9b8 Minor edit in CustomBodyState 2013-12-20 12:08:21 +01:00
Dander7BD 4e21e2b0c0 Renamed Formula::CollisionResponse::Impulse to.. 
.. Formula::CollisionResponse::Bounce
 2013-12-20 12:08:20 +01:00
Dander7BD 24418603ad ICustomBody::GetNormal returns Float4::null if.. 
.. no normal can be decided.
 2013-12-20 12:08:20 +01:00
Dander7BD 76c83add3d Added sanity check to SphericalRigidBody::GetNormalAt 2013-12-20 12:08:19 +01:00
Dander7BD 42418257cb CustomBodies now aware of it's scene 
+ other minor changes
 2013-12-20 12:08:18 +01:00
Robin Engman 59d5a3dc1e Created function for friction 2013-12-20 12:08:17 +01:00
Dander7BD 9cee69edd6 Extended friction content of the ICustomBody::State struct 2013-12-20 12:08:17 +01:00