Skip to content

Hzhang91branch #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seniorcheeseman wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Hzhang91branch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4665c77
mytest
wqst Sep 12, 2014
c9e8a6d
Merge branch 'master' of https://github.com/seniorcheeseman/PlatformG…
wqst Sep 12, 2014
01354f9
incomplete
wqst Sep 18, 2014
0cbe591
platform with bug
wqst Sep 19, 2014
9506639
bug commit
wqst Sep 19, 2014
01b1d9c
bug commit
wqst Sep 19, 2014
0966ed7
Delete rm_level01.room.gmx
seniorcheeseman Sep 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Platform Game.gmx/Platform Game.project.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<sprite>sprites\spr_spikebounds</sprite>
<sprite>sprites\spr_text</sprite>
<sprite>sprites\spr_next_level</sprite>
<sprite>sprites\spr_platformbounds</sprite>
<sprite>sprites\spr_redflaglimp</sprite>
<sprite>sprites\spr_redflagwaving</sprite>
<sprites name="Water">
Expand Down Expand Up @@ -104,6 +105,9 @@
<sprite>sprites\spr_fadingblock</sprite>
<sprite>sprites\spr_key</sprite>
<sprite>sprites\spr_doorlocked</sprite>
<sprite>sprites\spr_platform</sprite>
<sprite>sprites\spr_horplatform</sprite>
<sprite>sprites\spr_verplatform</sprite>
</sprites>
<sprites name="Spikes">
<sprite>sprites\spr_spikeblockhl</sprite>
Expand Down Expand Up @@ -138,6 +142,7 @@
<sprite>sprites\spr_blockflashing</sprite>
<sprite>sprites\spr_blockfrozen</sprite>
</sprites>
<sprite>sprites\sprite80</sprite>
</sprites>
<backgrounds name="background">
<background>background\bg_sky</background>
Expand All @@ -164,6 +169,7 @@
<object>objects\obj_text</object>
<object>objects\obj_next_level</object>
<object>objects\obj_pause_menu_controller</object>
<object>objects\obj_platformbound</object>
</objects>
<objects name="Player">
<object>objects\obj_player</object>
Expand All @@ -183,6 +189,8 @@
<object>objects\obj_fadingblock</object>
<object>objects\obj_goldkey</object>
<object>objects\obj_doorlocked</object>
<object>objects\obj_platform</object>
<object>objects\obj_horplatform</object>
</objects>
<objects name="Spikes">
<object>objects\obj_spikeblockvd</object>
Expand Down Expand Up @@ -219,10 +227,9 @@
</objects>
<rooms name="rooms">
<room>rooms\rm_initialize</room>
<room>rooms\rm_level01</room>
</rooms>
<constants number="2">
<constant name="GM_build_date">41894.9807427778</constant>
<constant name="GM_build_date">41901.9844195139</constant>
<constant name="GM_version">'1.0.0.1'</constant>
</constants>
<help>
Expand Down
104 changes: 104 additions & 0 deletions Platform Game.gmx/objects/obj_horplatform.object.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>spr_horplatform</spriteName>
<solid>-1</solid>
<visible>-1</visible>
<depth>0</depth>
<persistent>0</persistent>
<parentName>obj_platform</parentName>
<maskName>&lt;undefined&gt;</maskName>
<events>
<event eventtype="0" enumb="0">
<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>sprite_index = -1;
dir = -1;
movespeed = 3;
hsp = 0;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="3" enumb="0">
<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>mask_index = spr_horplatform;

hsp = dir * movespeed;

if (place_meeting(x+hsp,y,obj_platformbound))
{
while(!place_meeting(x+sign(hsp),y, obj_collision))
{
x += sign(hsp);
}
hsp = 0;
dir *= -1;
}
x += hsp;

if (instance_exists(obj_player))
{
if (round(obj_player.y + (obj_player.sprite_height/2)) &gt; y) || (obj_player.key_down) mask_index = -1;

else
{
mask_index = spr_platform;
if place_meeting(x, y-1, obj_player)
{
obj_player.hsp_carry = hsp;
}

}
}
</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>
<point>105,22</point>
<point>105,105</point>
</PhysicsShapePoints>
</object>
104 changes: 104 additions & 0 deletions Platform Game.gmx/objects/obj_platform.object.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>spr_platform</spriteName>
<solid>-1</solid>
<visible>-1</visible>
<depth>0</depth>
<persistent>0</persistent>
<parentName>obj_collision</parentName>
<maskName>&lt;undefined&gt;</maskName>
<events>
<event eventtype="0" enumb="0">
<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>sprite_index = -1;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="3" enumb="0">
<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 (instance_exists(obj_player))
{
if (round(obj_player.y + (obj_player.sprite_height/2)) &gt; y) || (obj_player.key_down) mask_index = -1;

else mask_index = spr_platform;



}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="8" enumb="0">
<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>draw_sprite(spr_platform,0,x,y);
</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>
<point>0,0</point>
<point>16,16</point>
</PhysicsShapePoints>
</object>
26 changes: 26 additions & 0 deletions Platform Game.gmx/objects/obj_platformbound.object.gmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>spr_platformbounds</spriteName>
<solid>0</solid>
<visible>0</visible>
<depth>0</depth>
<persistent>0</persistent>
<parentName>obj_collision</parentName>
<maskName>&lt;undefined&gt;</maskName>
<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>
<point>35,35</point>
<point>35,35</point>
</PhysicsShapePoints>
</object>
Loading