Komplette Spiellogik umgebaut. Die Animationen funzen leider nicht.
Animation funktioniert nun so halb. Scrolling hat einen derben Bug.
Levelwechsel funktioniert, Animation nachwievor fehlerhaft.
Levelwechsel funktioniert, Animation nachwievor fehlerhaft.
	new file:   res/charset/player.png
	new file:   res/charset/player_2.png
	modified:   res/maps/map1.txt
	modified:   res/maps/map2.txt
	new file:   res/maps/map3.txt
	modified:   res/tileset/tileset_1/set.png
	new file:   res/tileset/tileset_2/passable.txt
	new file:   res/tileset/tileset_2/set.png
	new file:   res/tileset/tileset_3/passable.txt
	new file:   res/tileset/tileset_3/set.png
	modified:   src/CompSprite.java
	new file:   src/CompSprite_alt.java
	modified:   src/Component.java
	new file:   src/ComponentSystem.java
	new file:   src/EntityManager.java
	new file:   src/Event.java
	modified:   src/Game.java
	modified:   src/GameUML.ucls
	modified:   src/InteractionSystem.java
	modified:   src/KeyHandler.java
	modified:   src/Level.java
	modified:   src/Map.java
	modified:   src/MovementSystem.java
	modified:   src/RenderSystem.java
	modified:   src/Scene_GameMenu.java
	modified:   src/Scene_Level.java
	modified:   src/Screen.java
	modified:   src/SpriteSet.java
	modified:   src/TileSet.java
	deleted:    src/Scene_Map.java
	deleted:    src/Sprite.java
Fertig zum Mergen.
Merge branch 'master' of http://github.com/propra13-orga/gruppeB1

Conflicts:
	res/tileset/tileset_3/passable.txt
	res/tileset/tileset_3/set.png
	src/Main.java
	src/Map.java
	src/Scene_GameMenu.java
	src/Scene_Map.java
	src/Sprite.java
	src/Window_Selectable.java

	new file:   GL.java
	new file:   Info zu mir.txt
	new file:   SoundButton.java
	modified:   res/tileset/tileset_3/passable.txt
	deleted:    src/Scene_StartMenu.java
	new file:   "\302\264Test.txt"