Commit 0d11cd04 authored by Ethan Liang's avatar Ethan Liang
Browse files

Merge remote-tracking branch 'origin/top-secret' into top-secret

parents 9106820f 7724bac7

app/src/main/java/com/example/game2d/ChalkGameActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ public class ChalkGameActivity extends AppCompatActivity { 
                });

            }

        }, 0, Interval);



    }

app/src/main/java/com/example/game2d/ChalkGameClass.java

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ import android.media.MediaPlayer; 
import android.view.MotionEvent;

import android.view.View;



import java.util.Timer;

import java.util.logging.Handler;





public class ChalkGameClass extends View {

    //PLAYER
@@ -46,6 +49,7 @@ public class ChalkGameClass extends View { 
        private int lifecounter;

        private int lifeXstart;

        private int lifeY;

        private Handler handler;





    private Bitmap pauseButton;