Commit Graph

9 Commits

Author SHA1 Message Date
Erik Persson d87e643777 lite saker + debug fönster 2013-11-26 11:30:49 +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 f78027a1cf dll - working
fix in unique pointer and array - missing copy constructor
2013-11-26 09:16:51 +01:00
Linda Andersson 0db45bd63f game_dll_usage 2013-11-25 12:36:25 +01:00
Linda Andersson 0e2401ef69 test with physics dll 2013-11-25 11:49:40 +01:00
Linda Andersson 15a55f76a3 test with physic 2013-11-25 11:03:06 +01:00
Linda Andersson b38545962b GL test main project: Drawing a object 2013-11-21 12:05:39 +01:00
Erik Persson ea0f3f05b4 added level and player 2013-11-19 11:07:14 +01:00