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

190 Commits

Author SHA1 Message Date
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
Erik Persson 8138afb6b5 object update 2013-11-29 09:00:12 +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
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
Linda Andersson 4cab44063d dll problems 2013-11-28 10:40:23 +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
Erik Persson b3ec2f3aa1 fix 2013-11-28 08:41:20 +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
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
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
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
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
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