Commit Graph

125 Commits

Author SHA1 Message Date
Erik Persson d87e643777 lite saker + debug fönster 2013-11-26 11:30:49 +01:00
Erik Persson 5cc6ff81b5 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
Conflicts:
	Code/GameLogic/Player.cpp
2013-11-26 09:26:04 +01:00
Erik Persson 2859588d20 added collisionManager
also some changes around the place
2013-11-26 09:19:59 +01:00
Linda Andersson abfd3116ca Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-26 09:17:25 +01:00
Linda Andersson f78027a1cf dll - working
fix in unique pointer and array - missing copy constructor
2013-11-26 09:16:51 +01:00
Erik Persson 220f1da8b6 added GameMode class to level 2013-11-26 08:56:31 +01:00
Erik Persson e2c90a467b reference manager for physics communication 2013-11-25 12:52:07 +01:00
Linda Andersson 0db45bd63f game_dll_usage 2013-11-25 12:36:25 +01:00
Linda Andersson 241d1b2d3d Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 12:34:13 +01:00
Linda Andersson de9a1cae56 Game_Dll_export 2013-11-25 12:33:27 +01:00
Dander7BD bf3dcd088b Moar dll fixes for Physics 2013-11-25 12:21:44 +01:00
Linda Andersson d600668df7 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-25 12:05:23 +01:00
Dander7BD 0bee758848 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 12:04:07 +01:00
Dander7BD cc67d227ab Dll fixes
API::Instance were not properly implemented
Added __stdcall
2013-11-25 12:03:41 +01:00
Linda Andersson 956fbc21e7 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-25 11:57:07 +01:00
Dander7BD 8ded483442 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 11:56:25 +01:00
Dander7BD 46abe2c8c6 namespace Physics::Error removed
No need for it anymore.
2013-11-25 11:55:58 +01:00
Linda Andersson de3286306a Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-25 11:51:18 +01:00
Linda Andersson 0e2401ef69 test with physics dll 2013-11-25 11:49:40 +01:00
Dander7BD 275c1a96d9 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 11:48:15 +01:00
Dander7BD 4072bf50fb Fixed DLL support for physics Engine
.. hopefully
2013-11-25 11:47:42 +01:00
Dander7BD d33d1f41bc Some documentation 2013-11-25 11:35:38 +01:00
Linda Andersson 97b599c99f Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-25 11:04:59 +01:00
Linda Andersson 15a55f76a3 test with physic 2013-11-25 11:03:06 +01:00
Robin Engman 1ff4fb6a20 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 10:55:33 +01:00
Robin Engman c3e3f9e461 Changed API.
Replaced unsigned int references with ICustomBody pointers and replaced
documentation as needed.
2013-11-25 10:54:27 +01:00
Dander7BD dece558947 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-25 08:58:21 +01:00
Dander7BD 6ac4254b9d Documentations
PhysicsAPI mostly documented.
Namespace MomentOFInertia and ICustomBody still not documented
2013-11-25 08:57:47 +01:00
Robin Engman 3ef5a46779 Added functions to API.
Now has access to inertia functions through physics API.
2013-11-22 11:52:45 +01:00
Dander7BD 8a9ea82d7d Added a namespace to PhysicsAPI
+ namespace MomentOfInertia
2013-11-22 11:17:14 +01:00
Dander7BD dad958b612 Added Math3D methods
ViewMatrix_LookAtDirection
ViewMatrix_LookAtPos

as requested by Pär
2013-11-22 10:49:17 +01:00
Robin Engman ba4576a07a Fixed projection and added overload function.
Overload function is for a different way of building FOV projection
matrices.
2013-11-22 10:44:06 +01:00
Dander7BD f7240ef16b Corrected OrientationMatrix_LookAtDirection
Z Axis were incorrectly negated
2013-11-22 10:23:00 +01:00
Dander7BD 61be10b573 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-22 09:22:17 +01:00
Robin Engman 6494bcb09e Added more inertia functions. 2013-11-22 08:58:00 +01:00
Dander7BD 91af42c0bd Merge conflict fixed 2013-11-21 17:27:28 +01:00
Dander7BD eba7995374 Merge remote-tracking branch 'origin/RigidBody' into Physics 2013-11-21 17:25:19 +01:00
Dander7BD 9749749748 IRigidBody done
Renamed to ICustomBody
* Added bunch of other stuff
2013-11-21 17:22:13 +01:00
Dander7BD af2b01d975 Fixed commit errors + other stuff 2013-11-21 15:29:35 +01:00
Dander7BD dc9f4597e2 Added OrientationMatrix build methods + other stuff 2013-11-21 15:19:32 +01:00
Dander7BD c6064887b7 Forgot to test compile RigidBody
Compile Errors is fixed
2013-11-21 13:15:10 +01:00
Dander7BD 4362b88a74 RigidBody DONE
Needs only testing for confirmations
2013-11-21 13:15:09 +01:00
Dander7BD 5aa8e07b0d Minor changes
Some argument renaming and changed a few RigidBody functions, in respect
to the change in the Box struct
2013-11-21 13:15:09 +01:00
Dander7BD 5cd36f1995 TangentialImpulseAcceleration
fixed selfexplanatory documentation
2013-11-21 13:15:08 +01:00
Robin Engman fbeeb5f72c Robin's fix part of RigidBody.cpp DONE 2013-11-21 13:15:07 +01:00
Dander7BD caa61d3ae9 Dans fix part of RigidBody.cpp DONE 2013-11-21 13:15:07 +01:00
Dander7BD 1b2c49457c Task assignment in RigidBody.cpp 2013-11-21 13:15:06 +01:00
Linda Andersson 2408bf49a1 projectfiles 2013-11-21 12:31:31 +01:00
Linda Andersson b38545962b GL test main project: Drawing a object 2013-11-21 12:05:39 +01:00
Robin Engman 3f518c72e8 Added inertia functions. 2013-11-21 11:47:34 +01:00