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

1439 Commits

Author SHA1 Message Date
Linda Andersson 2ca3cdd705 merge with sprint branch - working 2013-11-29 10:13:18 +01:00
Linda Andersson 4cb82e6396 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 10:04:59 +01:00
Linda Andersson 7a663b2e16 GL - camera movement working 2013-11-29 10:04:44 +01:00
Erik Persson f31bf1db5f some fixing 2013-11-29 10:03:32 +01:00
Dander7BD 026b427deb Implemented a temporary collision test update 
Will only call the subscribed CollisioEventAction whenevera collision is
detected.
 2013-11-29 10:00:07 +01:00
Robin Engman 1a06c7c7e6 Changed from pointer to reference 
Did it in sample and visit functions
 2013-11-29 10:00:06 +01:00
Robin Engman c31ea9730b Added overloads for visitor and sample functions 
They now have an overload for accepting ICollideable
 2013-11-29 10:00:05 +01:00
Dander7BD 5d5f684ad6 minor compilation error fix 
Forgot that UniquePointer had a special operator for checking if it is
not NULL >.<
 2013-11-29 10:00:04 +01:00
Dander7BD ec7185f463 Bunch of implementations 2013-11-29 10:00:03 +01:00
Pontus Fransson 10f8df45a8 Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Network 2013-11-29 09:36:31 +01:00
Erik Persson f9a1aaf43c Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 09:26:16 +01:00
Erik Persson b28a558732 fix transpose 2013-11-29 09:24:41 +01:00
Linda Andersson 04e48ec550 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 09:23:42 +01:00
dean11 de01d23d1d Fixed some structure issues and commented 2013-11-29 09:23:08 +01:00
Linda Andersson eb026cb9c7 GL more comments 2013-11-29 09:23:00 +01:00
Erik Persson 32c529feb6 converted camera class 2013-11-29 09:20:37 +01:00
Sam Mario Svensson 3c681352da Documentation of the code done by Sam 2013-11-29 09:19:14 +01:00
Pontus Fransson 407f3c5c9a Added documentation and removed unecessesary code. 2013-11-29 09:11:30 +01:00
Robin Engman bddc3acad2 Changed from pointer to reference 
Did it in sample and visit functions
 2013-11-29 09:07:52 +01:00
Linda Andersson d9fcec0c1c Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch 2013-11-29 09:05:12 +01:00
Linda Andersson 017efd55e5 GL starting commenting 2013-11-29 09:05:01 +01:00
Robin Engman 255a0b0070 Added overloads for visitor and sample functions 
They now have an overload for accepting ICollideable
 2013-11-29 09:03:37 +01:00
Erik Persson 8138afb6b5 object update 2013-11-29 09:00:12 +01:00
Sam Mario Svensson 1cbdb0bcfa cleanup commented section in ClientMain 2013-11-29 08:59:36 +01:00
dean11 a3ae340a30 Merge after pull from misc branch 2013-11-28 23:22:50 +01:00
dean11 f5aa5d03db Modified project file to include Thread in misc 2013-11-28 23:18:48 +01:00
Dander7BD 14b1f20b87 minor compilation error fix 
Forgot that UniquePointer had a special operator for checking if it is
not NULL >.<
 2013-11-28 18:05:19 +01:00
Dander7BD 834de9ba84 Bunch of implementations 2013-11-28 17:59:12 +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