5 Commits

Author	SHA1	Message	Date
Dennis Andersen	15d6ac8cf9	GameLogic - Final sprint2 merge	2013-12-20 09:42:02 +01:00
Dennis Andersen	0570d76e24	Modified part of some player states	2013-12-19 12:41:37 +01:00
Erik Persson	0ea08fbd54	gamesession testing	2013-12-19 10:21:03 +01:00
Erik Persson	e11d7d94f7	updated the weapon system, collisionManager and redid the "object" heirarki	2013-12-12 09:36:14 +01:00
Erik Persson	97e0b1298a	added functionallity to player and weapon, started on the weapon design.	2013-12-10 09:57:05 +01:00