Commit f4a37502 authored by Elena Berrios's avatar Elena Berrios
Browse files

Fix player walk animation

parent 90b65d4c

app/src/main/java/com/example/game2d/object/Player.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class Player extends Circle { 
        // Sprites

        Bitmap originalIdleRight = BitmapFactory.decodeResource(context.getResources(), R.drawable.boy_idle_right);

        spriteIdleRight = Bitmap.createScaledBitmap(originalIdleRight, 200, 200, false);

        Bitmap originalIdleLeft = BitmapFactory.decodeResource(context.getResources(), R.drawable.boy_idle_left);

        Bitmap originalIdleLeft = BitmapFactory.decodeResource(context.getResources(), R.drawable.boy_idle_fliped);

        spriteIdleLeft = Bitmap.createScaledBitmap(originalIdleLeft, 200, 200, false);

        Bitmap originalWalkRight = BitmapFactory.decodeResource(context.getResources(), R.drawable.boy_walk_right);

        spriteWalkRight = Bitmap.createScaledBitmap(originalWalkRight, 200, 200, false);

local.properties

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# For customization when using a Version Control System, please read the

# header note.

#Sat Apr 22 19:53:34 EDT 2023

=\=\=\=\=\=\=

sdk.dir=/Users/joharper/Library/Android/sdk

sdk.dir=/home/elena/Android/Sdk

# sdk.dir=/Users/joharper/Library/Android/sdk

>>>>>>>=fa0b39785e340f2e4603d94bdc597d48bc674390

<<<<<<<=HEAD