Commit Graph

592 Commits

Author SHA1 Message Date
Dander7BD 3a3d6fb151 Added comparison operators to UniquePointer and UniqueArray
operator ==
operator !=
2013-11-28 12:08:40 +01:00
Dander7BD b06a03a543 Improved Collision Event Subscription
From now on, will each ICustomBody instance have it's own
collisionAction function.
2013-11-28 12:08:40 +01:00
Dander7BD 39c54f4816 Moved Octree.h into the Implementation Filter 2013-11-28 12:08:39 +01:00
Dander7BD 64565b50de Merge remote-tracking branch 'origin/GameLogicBranch' into Physics 2013-11-28 11:59:15 +01:00
Dander7BD 3a6cb98b08 SimpleRigidBody factory done
not tested though
2013-11-28 11:58:46 +01:00
Linda Andersson 5ab1c39e3a GL stable - running from DanBiasGame 2013-11-28 11:46:20 +01:00
Linda Andersson ac37ff90de Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-28 11:27:02 +01:00
Erik Persson 42948a1412 collision and refrence managers updated 2013-11-28 11:23:11 +01:00
Linda Andersson bb7c635223 unstageing graphics 2013-11-28 11:20:46 +01:00
Robin Engman 6d12045df9 Merge remote-tracking branch 'origin/Physics' into Octree 2013-11-28 11:20:33 +01:00
Robin Engman 28dc57cf38 Added basic functionality for container 2013-11-28 11:18:07 +01:00
Dander7BD 23d3af21c6 Added comparison operators to UniquePointer and UniqueArray
operator ==
operator !=
2013-11-28 11:15:25 +01:00
Robin Engman ecbb606544 Added basic functionality for container. 2013-11-28 11:14:24 +01:00
Linda Andersson 4cab44063d dll problems 2013-11-28 10:40:23 +01:00
Dander7BD 07e3aa1697 Improved Collision Event Subscription
From now on, will each ICustomBody instance have it's own
collisionAction function.
2013-11-28 10:26:29 +01:00
Dander7BD 3a444aaae8 Moved Octree.h into the Implementation Filter 2013-11-28 10:24:32 +01:00
Erik Persson 9bddfc9ffa changed collision manager
is now a namespace with functions that are to be sent to a rigidbody
2013-11-28 09:26:29 +01:00
Pontus Fransson 0c40ca1be5 Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-11-28 08:52:22 +01:00
Pontus Fransson 00e02b6909 Removed OysterMath from OysterNetworkClient 2013-11-28 08:52:11 +01:00
Sam Mario Svensson a59cd54688 enum type naming fixed continued. 2013-11-28 08:51:21 +01:00
Pontus Fransson 0feb4dff7e Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-11-28 08:41:24 +01:00
Erik Persson b3ec2f3aa1 fix 2013-11-28 08:41:20 +01:00
Pontus Fransson 14eee7d2da Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Network 2013-11-28 08:40:40 +01:00
Sam Mario Svensson d29046652e enum type naming fixed 2013-11-28 08:40:38 +01:00
Erik Persson 899e833fca Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
Conflicts:
	Bin/DLL/GamePhysics_x86D.dll
	Bin/DLL/GamePhysics_x86D.exp
	Bin/DLL/GamePhysics_x86D.ilk
	Bin/DLL/GamePhysics_x86D.pdb
	Code/GameLogic/Object.cpp
	Code/GameLogic/Object.h
2013-11-28 08:37:56 +01:00
Erik Persson acd8681489 asd 2013-11-28 08:33:29 +01:00
dean11 5eec570768 Added an atomic<int> to the reference counter for thread saftey 2013-11-27 22:39:49 +01:00
dean11 fe7fd6b0b3 Fixed bugs in the threading wrapper 2013-11-27 21:47:32 +01:00
dean11 972cfa0d39 Fixed bugs with custom loading 2013-11-27 21:12:37 +01:00
Linda Andersson 01515a4d2d merge with physics 2013-11-27 16:21:57 +01:00
Linda Andersson c06a53addb Merge remote-tracking branch 'origin/Physics' into GameLogicBranch 2013-11-27 16:18:28 +01:00
Linda Andersson 1a5d1217a3 GL could draw an object but now adding DanBiasGame - problems with dll! 2013-11-27 16:17:47 +01:00
lanariel 8f6ca79e6b Unstable RenderTexture 2013-11-27 15:26:29 +01:00
Dander7BD 6ba10d48c6 Some matrix constructors made explicit 2013-11-27 15:24:09 +01:00
Dander7BD 36741de19b Evil Incompotent Compiler fix
Sometimes the compiler decides to not compile constructors properly. :(
Edited all constructors in Collision3D to reduce chance of this.
2013-11-27 15:20:29 +01:00
Pontus Fransson 6e24acea2b Listener's Accept() is now threaded.
Added function private to Connection SetBlockingMode(bool blocking); But
it doesn't do anything yet.
Listener is now accepting clients in a thread.
GetNewClient() returns the socket that has connected. -1 if there is no
new client connected. (Can only connect 1 client at a time.)
The simple chat program is not working anymore because of changes in the
server.
2013-11-27 14:33:08 +01:00
Linda Andersson fd1ac35c45 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-27 12:01:01 +01:00
Linda Andersson fb3ae57bbe GL: key input 2013-11-27 12:00:44 +01:00
Pontus Fransson 43b111f0d3 Pull MiscBranch 2013-11-27 11:28:11 +01:00
Pontus Fransson f02a67b9b1 Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Network 2013-11-27 11:26:54 +01:00
Pontus Fransson aeddc032d9 Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
	Code/Network/NetworkDependencies/Connection.cpp
	Code/Network/NetworkDependencies/Connection.h
	Code/Network/NetworkDependencies/IConnection.h
	Code/Network/OysterNetworkClient/Client.cpp
	Code/Network/OysterNetworkClient/Client.h
	Code/Network/OysterNetworkClient/ClientMain.cpp
	Code/Network/OysterNetworkServer/Client.cpp
	Code/Network/OysterNetworkServer/Client.h
	Code/Network/OysterNetworkServer/ServerMain.cpp
2013-11-27 11:06:03 +01:00
Pontus Fransson 214e29e906 OysterByte
Added Byte class instead of handling byte messages manually.
Converted all functions to use OysterByte.
2013-11-27 11:01:22 +01:00
Erik Persson 2ce74e74cc fix 2013-11-27 09:14:44 +01:00
Erik Persson 61777e23df Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch
Conflicts:
	Bin/DLL/GamePhysics_x86D.dll
	Bin/DLL/GamePhysics_x86D.exp
	Bin/DLL/GamePhysics_x86D.ilk
	Bin/DLL/GamePhysics_x86D.pdb
	Code/OysterGraphics/OysterGraphics.vcxproj
	Code/OysterGraphics/OysterGraphics.vcxproj.filters
	Code/OysterGraphics/OysterGraphics.vcxproj.filters.orig
2013-11-27 09:12:21 +01:00
lanariel 4b6cdab17b Stable Rendering 2013-11-27 08:22:20 +01:00
dean11 48c812b033 Forgot to follow coding standard... 2013-11-26 21:51:40 +01:00
dean11 e4904870b3 Added a threading wrapper with basic functionality that needs real testing 2013-11-26 21:08:34 +01:00
lanariel f9d9479dad Stable Dll read, unstable Pos 2013-11-26 15:33:05 +01:00
Sam Mario Svensson f6ade9e4fd ErrorMessages everywhere! 2013-11-26 13:45:03 +01:00
lanariel 2de2ef9cd0 Pre merge Commit 2013-11-26 13:44:58 +01:00
lanariel c2484a363d Merge branch 'Physics' of https://github.com/dean11/Danbias into Graphics 2013-11-26 13:43:33 +01:00
Dander7BD 62b1c68479 Created SphericalRigidBody
A rotateable rigidbody that represents something spherical.
2013-11-26 13:28:47 +01:00
Dander7BD 29362c8c60 Added more API & ICustomBody methods
API::Init
ICustomBody::SetSubscription
Gravity related calls
moved DLLMain.cpp
2013-11-26 13:28:46 +01:00
dean11 1f27336b3f Added filename paramater in custom load function 2013-11-26 12:09:38 +01:00
Linda Andersson 5e8e106327 add simple input class for testing 2013-11-26 11:33:16 +01:00
Erik Persson 97e92f8516 GL: debug fix 2013-11-26 11:32:00 +01:00
Erik Persson d87e643777 lite saker + debug fönster 2013-11-26 11:30:49 +01:00
lanariel f3be9f03a3 Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Graphics 2013-11-26 11:15:19 +01:00
dean11 e5cef4895e Added support for custom loading, unloading and reloading 2013-11-26 10:55:51 +01:00
Robin Engman 2890c2a9ea Added beginning of Octree class. 2013-11-26 10:21:20 +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
lanariel 973aadac2d Engine tweaks + DefferedVertexDefinition 2013-11-26 09:09:35 +01:00
Erik Persson 220f1da8b6 added GameMode class to level 2013-11-26 08:56:31 +01:00
Pontus Fransson 45c145439a Fixade crash och flyttade initsockets, shutdownsockets.
Moved initsocket and shutdownsockets to WinsockFunctions.
2013-11-25 20:27:23 +01:00
Pontus Fransson 6b57815bb8 Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
	Code/Network/NetworkDependencies/Connection.cpp
2013-11-25 19:05:28 +01:00
Pontus Fransson caabb6702e Fixed code standard, Added packing functions 2013-11-25 19:00:33 +01:00
Dander7BD 26e5fde8b0 Some PhysicsAPI implementations
Nothing related to the oct tree though. That will have be done next
2013-11-25 16:57:38 +01:00
Dander7BD a869771ffa Simple Rigid Body implementation
Second Iteration
[iteration 1]: stubs
[iteration 2]: implementations with shortcuts
[iteration final]: implementations with real solutions
2013-11-25 16:35:56 +01:00
Dander7BD 311beaac14 ICollideable edited
For some reason the Intersects() and Contains() methods were taking a
pointer as parameter then I am certain that I wrote it as a &-reference.
If someone edited this, there is no GIT history logged about it.

Please, DO NOT CHANGE this again, thanks
2013-11-25 14:22:38 +01:00
Sam Mario Svensson ca5e578af5 reconstruction in connection. 2013-11-25 14:03:32 +01:00
Dander7BD bc988eff0d ICustomBody Documented 2013-11-25 13:46:05 +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
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 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 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 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 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
lanariel 16be725743 Project Include Model 2013-11-20 16:55:13 +01:00
lanariel adfec528bf Fixing Render Namespace, See, todo in Resources.cpp 2013-11-20 16:51:53 +01:00
Linda Andersson 96245fc52e merged with wapon, static and dynamic 2013-11-20 16:01:39 +01:00
Linda Andersson 28da371b80 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-20 15:47:31 +01:00
Linda Andersson 68d516cc86 adding IGame interface 2013-11-20 15:47:11 +01:00
Erik Persson 717b425147 split worldObject into dynamic and static types 2013-11-20 14:25:37 +01:00
Erik Persson abf81b7c3c added weapon and connected it to player
changed player
2013-11-20 14:18:31 +01:00
Robin Engman da6eda2a8c Commented non-functional features. 2013-11-20 13:48:54 +01:00
Erik Persson ce9746f10c worldObject update 2013-11-20 12:23:45 +01:00
Dander7BD 687fb6835a TangentialImpulseAcceleration
fixed selfexplanatory documentation
2013-11-20 11:58:27 +01:00
Robin Engman 80301ae02e Robin's fix part of RigidBody.cpp DONE 2013-11-20 11:48:54 +01:00
Dander7BD 2149ca8ab5 Dans fix part of RigidBody.cpp DONE 2013-11-20 11:44:54 +01:00
Dander7BD e41d16cc03 Task assignment in RigidBody.cpp 2013-11-20 11:36:17 +01:00
Dander7BD b8d0a106b3 Physics branch disaster Patch
critical changes in Sprint1 branch caused major problems for the physics
patch. Files had to be backed up, Physics branch destroyed along with
it's log data. So that a new Physics branch could be made from the new
Sprint1. This patch is those copied files put back into the new physics
branch. .. logdata and 3hours lost (1h/person)
2013-11-20 11:09:27 +01:00
lanariel 3512121f52 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
Conflicts:
	Code/OysterGraphics/OysterGraphics.vcxproj
	Debug/Tester.ilk
	Debug/Tester.pdb
	OysterGraphics/Core/ShaderManager.cpp
	OysterGraphics/OysterGraphics.vcxproj.filters
	Tester/Debug/CL.read.1.tlog
	Tester/Debug/CL.write.1.tlog
	Tester/Debug/cl.command.1.tlog
	Tester/Debug/link.command.1.tlog
	Tester/Debug/link.read.1.tlog
	Tester/Debug/link.write.1.tlog
	Tester/Tester.vcxproj
2013-11-20 10:35:00 +01:00
Pontus Fransson 5bcc285141 Sending empty strings, prints messages on server 2013-11-20 10:34:05 +01:00
lanariel 425a838f31 Core Update 2013-11-20 10:22:01 +01:00
Erik Persson 27e5b07ef6 object and worldObject 2013-11-19 18:35:35 +01:00
Sam Mario Svensson 58efe7fdd3 getline fix in chat program 2013-11-19 14:59:00 +01:00
Pontus Fransson 816dced937 Chat test server 2013-11-19 14:24:38 +01:00
Sam Mario Svensson 1df11becf7 chat test with server
created simple chat program for the client to be able to chat between
client through a server
2013-11-19 14:18:34 +01:00
Pontus Fransson ac75e178ce Sending a message from server to client (done and done) 2013-11-19 13:42:50 +01:00
Sam Mario Svensson adcef51227 third time is the charm
fixed send and recieve functions in IConnection
2013-11-19 12:55:54 +01:00
Sam Mario Svensson 89ce3dd0d1 Fixed IConnection and Connection 2013-11-19 12:41:58 +01:00
Sam Mario Svensson 56c32fcbc3 Iconnection interface 2013-11-19 12:38:13 +01:00
Erik Persson ea0f3f05b4 added level and player 2013-11-19 11:07:14 +01:00
Erik Persson 33f9a86945 Added Game
cpp and h files
2013-11-19 09:52:36 +01:00
Pontus Fransson c04593b575 Changed name on main files on server and client 2013-11-19 09:34:24 +01:00
Pontus Fransson 1022b15ea2 Removed stuff from project files 2013-11-18 16:47:57 +01:00
Pontus Fransson 32348f4cc2 Removed old stuff, and added main files for all projects 2013-11-18 16:34:50 +01:00
dean11 33e7afabcd Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00