Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator

Spaceinator.project.gmx

@@ -26,6 +26,7 @@
       <sprite>sprites\spr_crafting</sprite>
       <sprite>sprites\spr_blackhole</sprite>
       <sprite>sprites\spr_final</sprite>
+      <sprite>sprites\spr_wormhole</sprite>
     </sprites>
   </sprites>
   <backgrounds name="background">

scripts/damage_player.gml

@@ -5,4 +5,3 @@ if(invuln_counter == invuln_counter_max)
     hp -= argument0;
     invuln_counter = 0;
 }
-

sprites/spr_player.sprite.gmx

@@ -8,9 +8,9 @@
   <sepmasks>-1</sepmasks>
   <bboxmode>0</bboxmode>
   <bbox_left>46</bbox_left>
-  <bbox_right>205</bbox_right>
-  <bbox_top>88</bbox_top>
-  <bbox_bottom>169</bbox_bottom>
+  <bbox_right>207</bbox_right>
+  <bbox_top>34</bbox_top>
+  <bbox_bottom>182</bbox_bottom>
   <HTile>0</HTile>
   <VTile>0</VTile>
   <TextureGroups>
@@ -26,5 +26,13 @@
     <frame index="3">images\spr_player_3.png</frame>
     <frame index="4">images\spr_player_4.png</frame>
     <frame index="5">images\spr_player_5.png</frame>
+    <frame index="6">images\spr_player_6.png</frame>
+    <frame index="7">images\spr_player_7.png</frame>
+    <frame index="8">images\spr_player_8.png</frame>
+    <frame index="9">images\spr_player_9.png</frame>
+    <frame index="10">images\spr_player_10.png</frame>
+    <frame index="11">images\spr_player_11.png</frame>
+    <frame index="12">images\spr_player_12.png</frame>
+    <frame index="13">images\spr_player_13.png</frame>
   </frames>
 </sprite>

sprites/spr_wormhole.sprite.gmx

@@ -0,0 +1,25 @@
+<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
+<sprite>
+  <type>0</type>
+  <xorig>16</xorig>
+  <yorigin>16</yorigin>
+  <colkind>1</colkind>
+  <coltolerance>0</coltolerance>
+  <sepmasks>0</sepmasks>
+  <bboxmode>0</bboxmode>
+  <bbox_left>0</bbox_left>
+  <bbox_right>31</bbox_right>
+  <bbox_top>2</bbox_top>
+  <bbox_bottom>31</bbox_bottom>
+  <HTile>0</HTile>
+  <VTile>0</VTile>
+  <TextureGroups>
+    <TextureGroup0>0</TextureGroup0>
+  </TextureGroups>
+  <For3D>0</For3D>
+  <width>32</width>
+  <height>32</height>
+  <frames>
+    <frame index="0">images\spr_wormhole_0.png</frame>
+  </frames>
+</sprite>