Merge remote-tracking branch 'origin/master'

# Conflicts:
#	core/src/com/game/Actor/Spike.java
#	core/src/com/game/Screens/Play.java

core/assets/levels/level1.tmx

@@ -29,4 +29,9 @@
    <polyline points="0,0 0,640 128,640 128,0 0,0"/>
   </object>
  </objectgroup>
+ <layer name="SPIKES" width="50" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRMApIBwAGQAAB
+  </data>
+ </layer>
 </map>

core/assets/levels/level2.tmx

@@ -29,4 +29,9 @@
    <polyline points="0,0 128,0 128,512 0,512 0,0"/>
   </object>
  </objectgroup>
+ <layer name="SPIKES" width="50" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRMApIBwAGQAAB
+  </data>
+ </layer>
 </map>

core/assets/levels/level3.tmx

@@ -29,4 +29,9 @@
    <polyline points="0,0 0,640 128,640 128,0 0,0"/>
   </object>
  </objectgroup>
+ <layer name="SPIKES" width="50" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRMApIBwAGQAAB
+  </data>
+ </layer>
 </map>

core/assets/levels/level5.tmx

@@ -29,4 +29,9 @@
    <polyline points="0,0 128,0 128,512 0,512 0,0"/>
   </object>
  </objectgroup>
+ <layer name="SPIKES" width="50" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRMApIBwAGQAAB
+  </data>
+ </layer>
 </map>

core/assets/levels/level8.tmx

@@ -32,7 +32,6 @@
    <polyline points="0,0 0,640 128,640 128,0 0,0"/>
   </object>
  </objectgroup>
- <objectgroup name="SPIKES"/>
  <layer name="SPIKES" width="50" height="8">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2AUUBOw0lnfKBhYMJLjDQAnTAAQ

core/assets/levels/level9.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="75" height="8" tilewidth="64" tileheight="64" nextobjectid="34">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="75" height="8" tilewidth="64" tileheight="64" nextobjectid="38">
  <tileset firstgid="1" name="platformSet" tilewidth="64" tileheight="64" tilecount="3" columns="3">
   <image source="../spritesheets/platformSet.png" width="192" height="64"/>
  </tileset>
@@ -8,7 +8,7 @@
  </tileset>
  <layer name="PLATFORM" width="75" height="8">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUDCRgRMPk6h3JgAmKYYAZCY+CUTAKRsFAAABsiAAV
+   eJxjYBgFQw0wIuFRgBswDbQDiASMDJTFKaVpgVA4DUQ4MpFoL7p6ZihGlqcU0Cu/IfsFVzgwYxEDgcFQNlBqN3p+QPYPMwNm3OIzY6ABEwP2OCTGD/gAJXpHAf0AADOTAFA=
   </data>
  </layer>
  <objectgroup name="PLAYER">
@@ -20,11 +20,18 @@
   </object>
  </objectgroup>
  <objectgroup name="FAILBOUNDARY">
-  <object id="33" x="0" y="704" width="4928" height="128"/>
+  <object id="36" x="0" y="704">
+   <polyline points="0,0 0,128 4928,128 4928,0 0,0"/>
+  </object>
  </objectgroup>
  <objectgroup name="PASSBOUNDARY">
   <object id="30" x="4800" y="-256">
    <polyline points="0,0 0,640 128,640 128,0 0,0"/>
   </object>
  </objectgroup>
+ <layer name="SPIKES" width="75" height="8">
+  <data encoding="base64" compression="zlib">
+   eJztwTEBAAAAwqD1T20JT6AAAHgaCWAAAQ==
+  </data>
+ </layer>
 </map>

core/src/com/game/Actor/Spike.java

@@ -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
             );
     }
 }

core/src/com/game/Screens/Play.java

@@ -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);