Lancaster-University/EEEEEEEEEEEEEEEAAAAAAAAAA-A-Reckless-Disregard-for-Mercy
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	core/src/com/game/Actor/Spike.java
#	core/src/com/game/Screens/Play.java
This commit is contained in:
Ash Reynolds 2016-02-22 18:54:07 +00:00
commit 9cd355036c
8 changed files with 50 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/src/com/game/Actor/Spike.java
View file

@ -29,10 +29,14 @@ public class Spike extends Base {
new Vector2((-size.x / 2 + 5) / PPM, (size.y / 2 + 5) / PPM),
new Vector2((size.x / 2 - 5) / PPM, (size.y / 2 + 5) / PPM)
},
"SPIKE",
"SPIKES",
true,
<<<<<<< HEAD
Vars.BIT_PRISMATIC,
Vars.BIT_PLAYER
=======
Vars.BIT_MISC, maskBits
>>>>>>> origin/master
);
}
}

15
core/src/com/game/Screens/Play.java
View file

@ -323,6 +323,7 @@ public class Play extends AbstractScreen {
*/
private void initWindows()
{
<<<<<<< HEAD
Vector2 winPos = new Vector2(280, 50);
Vector2 winSize = new Vector2(700, 500);
@ -335,6 +336,20 @@ public class Play extends AbstractScreen {
// Init INTRO buttons
myWindow tempWindow = windows.get(GameState.INTRO);
tempWindow.addButton(new myButton("Continue", new Vector2((tempWindow.getX() * 2) - 5, tempWindow.getHeight() - 50), skin, "default", new ClickListener() {
=======
introWindow = new Window("Level "+levelNumber, skin);
introWindow.getTitleLabel().setPosition(350, 500);
introBackground = new Image(app.assets.get("textures/level" + levelNumber + "Intro.png", Texture.class));
introWindow.setBackground(introBackground.getDrawable());
introWindow.setSize(700, 500);
introWindow.setPosition(280, 50);
introWindow.setVisible(true);
TextButton butProceed = new TextButton("PROCEED", skin, "default");
butProceed.setPosition((introWindow.getWidth() / 4) * 3, buttonSize.y + 360);
butProceed.setSize(buttonSize.x, buttonSize.y);
butProceed.addListener(new ClickListener() {
>>>>>>> origin/master
@Override
public void clicked(com.badlogic.gdx.scenes.scene2d.InputEvent event, float x, float y) {
setCurGameState(GameState.PLAYING);