AIcontroll hinzugefuegt
Revert "AIcontroll hinzugefuegt"

This reverts commit 40334bfb9a8196f84b7a436286305530d3ccaf70.
Revert "Revert "AIcontroll hinzugefuegt""

This reverts commit 78b1e2f37e1ee2a43219ae9e5d4cb79eac64aa28.
Merge remote-tracking branch 'origin/saskia'
Deleted Character, Changed Object
Merge remote-tracking branch 'origin/saskia' into lucas
Merge remote-tracking branch 'origin/saskia'
Merge remote-tracking branch 'origin/lucas'
change setVX setVY
AIControl change + Object constructor - still working
Correct Object Constructor
Clean Collisionmanager
Merge remote-tracking branch 'origin/saskia'
Merge remote-tracking branch 'origin/lucas' into jonas

Conflicts:
	Revenge_of_the_Penguins/aicontrol.cpp
Angriff bearbeitet