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

926 Commits

Author SHA1 Message Date
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
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
lanariel 3ef36547a9 Merge branch 'RigidBody' of https://github.com/dean11/Danbias into Graphics 2013-11-21 15:21:03 +01:00
Dander7BD 8af3cde642 Merge remote-tracking branch 'origin/RigidBody' into Graphics 2013-11-21 15:20:19 +01:00
Dander7BD dc9f4597e2 Added OrientationMatrix build methods + other stuff 2013-11-21 15:19:32 +01:00
Pontus Fransson dcf456ce6d Fixed implementation of Translator 2013-11-21 14:49:30 +01:00
lanariel b419849fd4 Merged Obj and Engine Restructure 2013-11-21 14:17:03 +01:00
lanariel 9a0206bf35 More 2013-11-21 14:14:30 +01:00
lanariel 7b31377be8 Engine Sructured 2013-11-21 13:50:43 +01:00
Pontus Fransson 7c417dd223 Merge 2013-11-21 13:46:25 +01:00
Tobias Grundel f08e9491ed ObjReader 2013-11-21 13:45:11 +01:00
Pontus Fransson 87e1cf0436 Added Message base class 
Packing functions,
MessageHeader; MessageTest,
 2013-11-21 13:42:38 +01:00
Sam Mario Svensson f77efb107d Implemented Translator 
also fixed some coding standards with namespaces in client, connection,
listener, server.
added protocols with enums for packagetype.
 2013-11-21 13:40:52 +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
Tobias Grundel ddbc808977 Re-fixed ObjReader 2013-11-21 12:47:47 +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
Dander7BD 938826b84e Forgot to test compile RigidBody 
Compile Errors is fixed
 2013-11-21 11:47:20 +01:00
Dander7BD f51d2312dd RigidBody DONE 
Needs only testing for confirmations
 2013-11-21 11:39:11 +01:00
Linda Andersson ece4a74838 succesfull merge 2013-11-21 10:07:49 +01:00
Linda Andersson a220faf7b6 Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 2013-11-21 10:05:48 +01:00
Linda Andersson 8f0d6ec139 core update 2013-11-21 10:05:40 +01:00
Linda Andersson 2c395807cd Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch 2013-11-21 10:04:47 +01:00
lanariel a94429fd9d Fixed Unresolved Externals from Hiarchy Flattening 2013-11-21 10:02:17 +01:00
Linda Andersson 229741e707 merge with graphics 2013-11-21 09:46:26 +01:00
lanariel dc9c448150 Fix compile Errors 2013-11-21 09:43:53 +01:00
Dander7BD d90074d909 Minor changes 
Some argument renaming and changed a few RigidBody functions, in respect
to the change in the Box struct
 2013-11-20 17:40:12 +01:00
Dander7BD 8dee300dc8 Merge remote-tracking branch 'origin/Physics' into RigidBody 2013-11-20 17:01:12 +01:00
Dander7BD baec4b0392 Box updated 
orientation Matrix have been split into a rotation Matrix and a
translation Vector
 2013-11-20 16:59:12 +01:00