Merge remote-tracking branch 'origin/dev_client' into dev_client
# Conflicts: # Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java # Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/AnimationHandler.java
This commit is contained in:
		@@ -7,11 +7,11 @@ public class AnimationHandler {
 | 
			
		||||
 | 
			
		||||
    private Animation animation = null;
 | 
			
		||||
 | 
			
		||||
    public AnimationHandler(MdgaApp app_) {
 | 
			
		||||
        app = app_;
 | 
			
		||||
    public AnimationHandler(MdgaApp app) {
 | 
			
		||||
        this.app = app;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public void playAnimation(AnimationType type) {
 | 
			
		||||
    public void playAnimation() {
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user