Commit Graph

740 Commits

Author SHA1 Message Date
lindaandersson 09693c7f35 GL - merge 2014-01-30 09:40:58 +01:00
lindaandersson 7d9d8e4615 GL - added jump 2014-01-30 09:07:56 +01:00
lindaandersson c593fd2225 Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-29 16:02:11 +01:00
lindaandersson 44ba45bcc2 GL - added setCollisionfunc to object 2014-01-29 16:01:56 +01:00
Dennis Andersen 1e89bb4e30 Fixed protocol messaging. Known crash when recieveing protocol on server after a while... 2014-01-29 15:01:14 +01:00
Dander7BD 88e67ff876 Inertia big patch
It's ali-..WORKS! It works!
2014-01-29 14:57:39 +01:00
lindaandersson 446bdd412b GL - updated constructors to set before and after collision response functions 2014-01-29 14:33:21 +01:00
lindaandersson 3a9c47722a Merge remote-tracking branch 'origin/Physics' into GameLogic 2014-01-29 13:18:25 +01:00
lindaandersson 16334ea2db GL - collision working, going to merge with physics 2014-01-29 13:18:17 +01:00
Robin Engman aa99742894 Added epsilon value for testing 2014-01-29 12:22:18 +01:00
Robin Engman 1d3b073e7f Added functionallity to stop collision responses 2014-01-29 11:22:04 +01:00
Robin Engman 4ccf11b5d6 Fixed vector issue 2014-01-29 10:54:59 +01:00
Dennis Andersen 36f057d2cc Broekn branch not broekn more 2014-01-29 10:18:01 +01:00
Dander7BD 60062feb07 Documentation update
Math treatises
2014-01-28 17:51:02 +01:00
lindaandersson 3b552d5361 GL - change gamelogic to use the new physics 2014-01-28 15:44:32 +01:00
lindaandersson 9ccfebd9fd GL - merge with physics 2014-01-28 15:43:32 +01:00
lindaandersson a56fcbcb9b GL - can send object position from level objects, gravity and frustrum problems. 2014-01-28 15:04:25 +01:00
Robin Engman 42addb9c06 Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2014-01-28 13:39:28 +01:00
Robin Engman 15ae3675b4 Updated UML with functions 2014-01-28 13:39:15 +01:00
Dander7BD 78706f9929 Revert "Formula fix"
This reverts commit 8435a2c970.
2014-01-28 11:43:24 +01:00
Dander7BD 8435a2c970 Formula fix
TangentialLinearMomentum(..)
2014-01-28 11:31:23 +01:00
Robin Engman eb27a4edfb Added ExtractForward to frustum. 2014-01-28 10:38:58 +01:00
Robin Engman 6148783fe4 Added args to ApplyEffect 2014-01-28 10:18:26 +01:00
Robin Engman f96c5a9f7e Changed float4 to float3 2014-01-28 09:52:58 +01:00
Robin Engman 018d6e3c5a Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2014-01-28 09:25:07 +01:00
Robin Engman 5d1e05cc4e Added new function to set orientation. 2014-01-28 09:24:51 +01:00
Dander7BD 6be72da03a OysterPhysics3D updated
* changed Float4 in header API to Float3
* removed all Set...( Float4x4 ) methods
2014-01-28 09:24:09 +01:00
Robin Engman a07e2911de Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2014-01-28 09:01:50 +01:00
Robin Engman 5bf92757a5 State struct fixed since last inactivation. 2014-01-28 09:01:35 +01:00
Dander7BD 201095eb41 Merge remote-tracking branch 'origin/Moment-of-Inertia' into Physics 2014-01-28 09:00:47 +01:00
Dennis Andersen 91e825dbfb Broekn stuff to tobias 2014-01-28 09:00:02 +01:00
Dander7BD 4d6cfaf046 ... part 3 -_- 2014-01-28 08:57:14 +01:00
Dander7BD 4e4aaf881a Inactivated code part 2
Matrix to angularAxis conversions in OysterMath
2014-01-28 08:56:29 +01:00
Dander7BD cbdce81b20 Inactivated code
Matrix to Angular Axis
2014-01-28 08:54:20 +01:00
Dander7BD 87793b3926 Added documentation
Timestep Impulse fix treatise / proposition
2014-01-27 15:04:48 +01:00
Erik Persson e11dc6551c GL - ? 2014-01-27 14:45:19 +01:00
lindaandersson a8dbf2a4c9 GL - added test box to level 2014-01-27 14:43:39 +01:00
lindaandersson 3896514bae GL - mergecommit 2014-01-27 14:02:37 +01:00
lindaandersson 4085a5f5e2 GL - added shot protocol 2014-01-27 13:56:31 +01:00
Erik Persson 1ed1bab751 Created test box that should now be shot at by the player 2014-01-27 13:55:09 +01:00
lindaandersson 5b984db9ba GL - gameState merge 2014-01-27 13:25:09 +01:00
Erik Persson 74ac5e2d31 Updated creation of objects 2014-01-27 08:54:25 +01:00
Dander7BD 30054a8c23 Slerp compile fix 2014-01-24 17:48:49 +01:00
Dander7BD b4eb3eb25d Slerp
Quaternion Slerp
2014-01-24 17:39:09 +01:00
Dander7BD 2da3dd29fc InterpolateOrientation_UsingNonRigidNlerp 2014-01-24 16:32:54 +01:00
Dander7BD 8f63bf637e Physics UMLET diagram
Current state under sprint 3
2014-01-24 15:03:03 +01:00
Dander7BD ff936133fc Physics engine now using struct MomentOfInertia
Some API impact for the other modules.
* Desc. structs
* State struct
2014-01-23 19:13:02 +01:00
Dander7BD c3ed5e78ac struct ::Oyster::Physics3D::MomentOfInertia 2014-01-23 18:45:33 +01:00
Dander7BD ee5392c60d Vector::PiecewiseMultiplicationAdd
and a few other minor changes in the math lib
2014-01-23 18:34:48 +01:00
Dander7BD 163481ce4f Documentation edit
Were missing a final step about the ang. momentum toang. velocity
conversion documentation.
2014-01-23 18:33:48 +01:00