Commit Graph

13 Commits

Author SHA1 Message Date
dean11 c0807442a4 Fixed some minor errors with project linking 2013-11-29 11:04:52 +01:00
Linda Andersson eb026cb9c7 GL more comments 2013-11-29 09:23:00 +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
Erik Persson 8138afb6b5 object update 2013-11-29 09:00:12 +01:00
Erik Persson 42948a1412 collision and refrence managers updated 2013-11-28 11:23:11 +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 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 1a5d1217a3 GL could draw an object but now adding DanBiasGame - problems with dll! 2013-11-27 16:17:47 +01:00
Erik Persson d87e643777 lite saker + debug fönster 2013-11-26 11:30:49 +01:00
Linda Andersson b38545962b GL test main project: Drawing a object 2013-11-21 12:05:39 +01:00
Erik Persson 27e5b07ef6 object and worldObject 2013-11-19 18:35:35 +01:00