Commit Graph

1063 Commits

Author SHA1 Message Date
Dander7BD bf3dcd088b Moar dll fixes for Physics 2013-11-25 12:21:44 +01:00
Sam Mario Svensson 82b8ef7b05 Fixed connection split up connect function and added initiateClient() 2013-11-25 12:14:01 +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
Sam Mario Svensson 640ac2172a checked the coding standard and changed it accordinly 2013-11-25 11:39:54 +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
Pontus Fransson ad7091e520 Fixed automatic size on Messages 2013-11-22 15:48:49 +01:00
lanariel abed0157ec Do fix during weekend; Non stable 2013-11-22 15:18:52 +01:00
Pontus Fransson 6eff55e763 Fixed possible crash 2013-11-22 14:31:07 +01:00
Pontus Fransson d33220f8ca Fixed memory leaks
Fixed memory leaks.
2013-11-22 14:23:08 +01:00
lanariel 205c58430f Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Graphics 2013-11-22 14:14:54 +01:00
lanariel 328e4777ce Started to wrap into dll 2013-11-22 14:09:47 +01:00
dean11 7b0265db1d Merge branch 'Graphics' of https://github.com/dean11/Danbias into MiscBranch 2013-11-22 12:05:58 +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
Pontus Fransson 623cffced6 Added protocols to an enum
Now we don't have to type cast
2013-11-22 11:40:55 +01:00
Dander7BD 8a9ea82d7d Added a namespace to PhysicsAPI
+ namespace MomentOfInertia
2013-11-22 11:17:14 +01:00
lanariel fcd88a63ae deletedFiles 2013-11-22 11:07:14 +01:00
lanariel 08b4fb5dfd Merge branch 'Physics' of https://github.com/dean11/Danbias into Graphics
Conflicts:
	Code/Debug/Tester.ilk
	Code/Debug/Tester.pdb
2013-11-22 11:05:04 +01:00
lanariel 3cd4c12172 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics 2013-11-22 10:56:21 +01:00
lanariel 59dcbc9729 Fixed Projection 2013-11-22 10:55:21 +01:00
Dander7BD dad958b612 Added Math3D methods
ViewMatrix_LookAtDirection
ViewMatrix_LookAtPos

as requested by Pär
2013-11-22 10:49:17 +01:00
dean11 15455db1b2 Added a resource handler with basic byte loading 2013-11-22 10:46:25 +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 480a624019 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics 2013-11-22 10:24:08 +01:00
Dander7BD f7240ef16b Corrected OrientationMatrix_LookAtDirection
Z Axis were incorrectly negated
2013-11-22 10:23:00 +01:00
Sam Mario Svensson 9e6593abd1 bug med reference på typecast 2013-11-22 09:49:48 +01:00
Pontus Fransson c5e432b566 Fixed size 2013-11-22 09:43:24 +01:00
Pontus Fransson bacb83b084 Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
	Code/Network/NetworkDependencies/Connection.cpp
	Code/Network/NetworkDependencies/Connection.h
	Code/Network/OysterNetworkClient/ClientMain.cpp
	Code/Network/OysterNetworkServer/ServerMain.cpp
2013-11-22 09:24:44 +01:00
Dander7BD 61be10b573 Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-22 09:22:17 +01:00
Pontus Fransson 5265fd1af1 Fixed merge errors 2013-11-22 09:17:07 +01:00
Robin Engman 6494bcb09e Added more inertia functions. 2013-11-22 08:58:00 +01:00
Pontus Fransson 954a1ac669 Fixed error
Fixed translation
2013-11-22 08:56:00 +01:00
Sam Mario Svensson 4142688f6c unsigned char instead of char and chat program with protocols 2013-11-22 08:54:26 +01:00
lanariel 5abaef6e86 Fixed render errors 2013-11-21 23:54:12 +01:00
lanariel ff1695497f Debug From Home 2013-11-21 18:31:16 +01:00
Dander7BD 91af42c0bd Merge conflict fixed 2013-11-21 17:27:28 +01:00