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

312 Commits

Author SHA1 Message Date
dean11 f5aa5d03db Modified project file to include Thread in misc 2013-11-28 23:18:48 +01:00
Pontus Fransson 8dab865cb6 Changed to our own Queue 2013-11-28 16:20:50 +01:00
Dander7BD 9d92b292d9 Improved documentation of UniquePointer and UniqueArray 2013-11-28 16:18:20 +01:00
Pontus Fransson 1453d81a9d Merge branch 'Network' of https://github.com/dean11/Danbias into Network 2013-11-28 16:15:41 +01:00
Pontus Fransson 1617606145 PostBox 
Created PostBox and IPostBox.
Listener post new clients to PostBox.
 2013-11-28 16:15:28 +01:00
Sam Mario Svensson 23fa090296 Threadsafe Queue implemented with IQueue interface 
threadsafe by using mutex lock in the Queue
 2013-11-28 16:14:59 +01:00
Dander7BD 036519f3f6 Fixed potential ambiguity bug 
Ambiguity in assignment operator with UniquePointer and UniqueArray
 2013-11-28 16:06:01 +01:00
Dander7BD 045cfe28fe Renamed Utilities-InlineImpl.h to Utilities-Impl.h 
Implied that only Inlines were implemented there.
Contains template implementations as well.
 2013-11-28 15:45:09 +01:00
dean11 0785e54dfd Removed .orig files after merge 2013-11-28 15:19:52 +01:00
dean11 6e71b6ac54 Fixed merging errors 2013-11-28 15:17:25 +01:00
dean11 cc4835a97b Merge with Physics branch 2013-11-28 15:09:09 +01:00
Dander7BD d241298308 merging MiscBranch into Physics with conflict fixes 2013-11-28 14:52:13 +01:00
lanariel 9bf84cdc65 Stable Graphics, hard coded texture read in ObjReader.ToModel 2013-11-28 14:34:52 +01:00
Robin Engman 4672984b51 Merge remote-tracking branch 'origin/Octree' into Physics 2013-11-28 14:19:11 +01:00
Robin Engman 632d412f9c Fixed sample and added visit. 2013-11-28 14:18:44 +01:00
Robin Engman 35f66da760 Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics 2013-11-28 13:43:38 +01:00
dean11 d08644e8e1 Added a force reload feture in resource loading 2013-11-28 13:43:11 +01:00
Dander7BD f379ed49e5 inertiaTensor removed from API::SphericalBodyDescription 
was redundant. struct already have everything that the factory needs to
generate one.
 2013-11-28 12:18:06 +01:00
Dander7BD 2928e08252 SphericalRigidBody factory done 
not tested though
 2013-11-28 12:13:14 +01:00
Dander7BD 89fd71fb02 SimpleRigidBody factory done 
not tested though
 2013-11-28 12:08:41 +01:00
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 92c20b368b merge with GL 2013-11-28 11:31:00 +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