View

Klasse mainwindow durch window(QWidget) ersetzt
Merge remote-tracking branch 'origin/master' into lukas
Improved GameManager
KillManager
Added Collision for Objects
Small Changes
Improved Inventory
Adjust weapon inheritance
Merge remote-tracking branch 'origin/lukas' into jonas
KillManager
Log + game_dir + gameManager
Log + game_dir + gameManager
Merge remote-tracking branch 'origin/jonas' into jonas

Conflicts:
	Revenge_of_the_Penguins/aicontrol.cpp
keine Ahnung
View läuft

es läuft
added get sprite
View

Klasse mainwindow durch window(QWidget) ersetzt
KillManager
Merge to drawable game
Generals update

Bots are moving towards the player, colliding
Yeti is shooting