Merge branch 'master' of https://bitbucket.org/SilicaAndPina/spaceinator
This commit is contained in:
JoshuanBurger12
commit
63a9f38f6a
10 changed files with 165 additions and 2 deletions
|
|
@ -443,7 +443,7 @@
|
|||
<option_shortcircuit>True</option_shortcircuit>
|
||||
<option_showcursor>True</option_showcursor>
|
||||
<option_showprogress>1</option_showprogress>
|
||||
<option_sizeable>False</option_sizeable>
|
||||
<option_sizeable>True</option_sizeable>
|
||||
<option_stayontop>false</option_stayontop>
|
||||
<option_sync_vertex>0</option_sync_vertex>
|
||||
<option_textureGroup0_border>2</option_textureGroup0_border>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@
|
|||
<Config>Configs\Default</Config>
|
||||
</Configs>
|
||||
<NewExtensions/>
|
||||
<sounds name="sound"/>
|
||||
<sounds name="sound">
|
||||
<sound>sound\snd_engine</sound>
|
||||
</sounds>
|
||||
<sprites name="sprites">
|
||||
<sprite>sprites\spr_player</sprite>
|
||||
<sprite>sprites\spr_blocks</sprite>
|
||||
|
|
@ -17,6 +19,7 @@
|
|||
<paths name="paths"/>
|
||||
<objects name="objects">
|
||||
<object>objects\obj_player</object>
|
||||
<object>objects\obj_controller</object>
|
||||
</objects>
|
||||
<rooms name="rooms">
|
||||
<room>rooms\rm_game</room>
|
||||
|
|
|
|||
BIN
help.rtf
BIN
help.rtf
Binary file not shown.
54
objects/obj_controller.object.gmx
Normal file
54
objects/obj_controller.object.gmx
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
|
||||
<object>
|
||||
<spriteName><undefined></spriteName>
|
||||
<solid>0</solid>
|
||||
<visible>-1</visible>
|
||||
<depth>0</depth>
|
||||
<persistent>-1</persistent>
|
||||
<parentName><undefined></parentName>
|
||||
<maskName><undefined></maskName>
|
||||
<events>
|
||||
<event eventtype="9" enumb="122">
|
||||
<action>
|
||||
<libid>1</libid>
|
||||
<id>603</id>
|
||||
<kind>7</kind>
|
||||
<userelative>0</userelative>
|
||||
<isquestion>0</isquestion>
|
||||
<useapplyto>-1</useapplyto>
|
||||
<exetype>2</exetype>
|
||||
<functionname></functionname>
|
||||
<codestring></codestring>
|
||||
<whoName>self</whoName>
|
||||
<relative>0</relative>
|
||||
<isnot>0</isnot>
|
||||
<arguments>
|
||||
<argument>
|
||||
<kind>1</kind>
|
||||
<string>if(window_get_fullscreen())
|
||||
{
|
||||
window_set_fullscreen(0);
|
||||
}
|
||||
else
|
||||
{
|
||||
window_set_fullscreen(1);
|
||||
}
|
||||
</string>
|
||||
</argument>
|
||||
</arguments>
|
||||
</action>
|
||||
</event>
|
||||
</events>
|
||||
<PhysicsObject>0</PhysicsObject>
|
||||
<PhysicsObjectSensor>0</PhysicsObjectSensor>
|
||||
<PhysicsObjectShape>0</PhysicsObjectShape>
|
||||
<PhysicsObjectDensity>0.5</PhysicsObjectDensity>
|
||||
<PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
|
||||
<PhysicsObjectGroup>0</PhysicsObjectGroup>
|
||||
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
|
||||
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
|
||||
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
|
||||
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
|
||||
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
|
||||
<PhysicsShapePoints/>
|
||||
</object>
|
||||
|
|
@ -58,6 +58,7 @@ view_yview[0] = y - view_hview[0]/2;
|
|||
<kind>1</kind>
|
||||
<string>direction = image_angle
|
||||
speed += 5
|
||||
|
||||
</string>
|
||||
</argument>
|
||||
</arguments>
|
||||
|
|
@ -104,6 +105,52 @@ speed += 5
|
|||
<argument>
|
||||
<kind>1</kind>
|
||||
<string>image_angle -= 5;
|
||||
</string>
|
||||
</argument>
|
||||
</arguments>
|
||||
</action>
|
||||
</event>
|
||||
<event eventtype="9" enumb="87">
|
||||
<action>
|
||||
<libid>1</libid>
|
||||
<id>603</id>
|
||||
<kind>7</kind>
|
||||
<userelative>0</userelative>
|
||||
<isquestion>0</isquestion>
|
||||
<useapplyto>-1</useapplyto>
|
||||
<exetype>2</exetype>
|
||||
<functionname></functionname>
|
||||
<codestring></codestring>
|
||||
<whoName>self</whoName>
|
||||
<relative>0</relative>
|
||||
<isnot>0</isnot>
|
||||
<arguments>
|
||||
<argument>
|
||||
<kind>1</kind>
|
||||
<string>audio_play_sound(snd_engine,1,true);
|
||||
</string>
|
||||
</argument>
|
||||
</arguments>
|
||||
</action>
|
||||
</event>
|
||||
<event eventtype="10" enumb="87">
|
||||
<action>
|
||||
<libid>1</libid>
|
||||
<id>603</id>
|
||||
<kind>7</kind>
|
||||
<userelative>0</userelative>
|
||||
<isquestion>0</isquestion>
|
||||
<useapplyto>-1</useapplyto>
|
||||
<exetype>2</exetype>
|
||||
<functionname></functionname>
|
||||
<codestring></codestring>
|
||||
<whoName>self</whoName>
|
||||
<relative>0</relative>
|
||||
<isnot>0</isnot>
|
||||
<arguments>
|
||||
<argument>
|
||||
<kind>1</kind>
|
||||
<string>audio_stop_sound(snd_engine)
|
||||
</string>
|
||||
</argument>
|
||||
</arguments>
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
</views>
|
||||
<instances>
|
||||
<instance objName="obj_player" x="512" y="512" name="inst_E89CF1B4" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
|
||||
<instance objName="obj_controller" x="0" y="0" name="inst_12F93A6E" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
|
||||
</instances>
|
||||
<tiles/>
|
||||
<PhysicsWorld>0</PhysicsWorld>
|
||||
|
|
|
|||
BIN
sound/audio/snd_engine.wav
Normal file
BIN
sound/audio/snd_engine.wav
Normal file
Binary file not shown.
BIN
sound/audio/sound0_146770__qubodup__rocket-boost-engine-loop.wav
Normal file
BIN
sound/audio/sound0_146770__qubodup__rocket-boost-engine-loop.wav
Normal file
Binary file not shown.
29
sound/snd_engine.sound.gmx
Normal file
29
sound/snd_engine.sound.gmx
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
|
||||
<sound>
|
||||
<kind>0</kind>
|
||||
<extension>.wav</extension>
|
||||
<origname>sound\audio\snd_engine.wav</origname>
|
||||
<effects>0</effects>
|
||||
<volume>
|
||||
<volume>1</volume>
|
||||
</volume>
|
||||
<pan>0</pan>
|
||||
<bitRates>
|
||||
<bitRate>192</bitRate>
|
||||
</bitRates>
|
||||
<sampleRates>
|
||||
<sampleRate>44100</sampleRate>
|
||||
</sampleRates>
|
||||
<types>
|
||||
<type>1</type>
|
||||
</types>
|
||||
<bitDepths>
|
||||
<bitDepth>16</bitDepth>
|
||||
</bitDepths>
|
||||
<preload>-1</preload>
|
||||
<data>snd_engine.wav</data>
|
||||
<compressed>1</compressed>
|
||||
<streamed>1</streamed>
|
||||
<uncompressOnLoad>0</uncompressOnLoad>
|
||||
<audioGroup>0</audioGroup>
|
||||
</sound>
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
|
||||
<sound>
|
||||
<kind>0</kind>
|
||||
<extension>.wav</extension>
|
||||
<origname>sound\audio\sound0_146770__qubodup__rocket-boost-engine-loop.wav</origname>
|
||||
<effects>0</effects>
|
||||
<volume>
|
||||
<volume>1</volume>
|
||||
</volume>
|
||||
<pan>0</pan>
|
||||
<bitRates>
|
||||
<bitRate>192</bitRate>
|
||||
</bitRates>
|
||||
<sampleRates>
|
||||
<sampleRate>44100</sampleRate>
|
||||
</sampleRates>
|
||||
<types>
|
||||
<type>0</type>
|
||||
</types>
|
||||
<bitDepths>
|
||||
<bitDepth>16</bitDepth>
|
||||
</bitDepths>
|
||||
<preload>-1</preload>
|
||||
<data>sound0_146770__qubodup__rocket-boost-engine-loop.wav</data>
|
||||
<compressed>0</compressed>
|
||||
<streamed>0</streamed>
|
||||
<uncompressOnLoad>0</uncompressOnLoad>
|
||||
<audioGroup>0</audioGroup>
|
||||
</sound>
|
||||
Reference in a new issue