Fixed merge conflict?
This commit is contained in:
parent
2d54c76bc6
commit
0ebc582e40
@ -1022,7 +1022,7 @@ public class BlueBaseFrames {
|
||||
String path = "textures/Sprite_sans_grille_9comp.png";
|
||||
String pathToBG = "textures/arena1.png";
|
||||
|
||||
Frame f = BlueNormals.ForwardDFrame0();
|
||||
Frame f = BlueNormals.crouchAFrame1();
|
||||
|
||||
|
||||
ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null);
|
||||
|
Loading…
x
Reference in New Issue
Block a user