steffo/stack
steffo/stack
1
Fork 0
mirror of https://github.com/Steffo99/stack.git synced 2024-11-22 07:54:20 +00:00
Code Activity

Reso i luchetti più simili ai muri.

Browse source
This commit is contained in:
Steffo 2013-07-17 22:48:38 +02:00
parent e5bdcdd221
commit 861ae352e7
15 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configs/Default.config.gmx
View file

@ -222,7 +222,7 @@
<option_use_new_audio>True</option_use_new_audio>
<option_variableerrors>False</option_variableerrors>
<option_version>Alpha</option_version>
<option_version_build>3</option_version_build>
<option_version_build>4</option_version_build>
<option_version_company>Royal Games</option_version_company>
<option_version_copyright>lolno</option_version_copyright>
<option_version_description></option_version_description>

6
objects/o_lock_red.object.gmx
View file

@ -21,8 +21,8 @@
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints>
<point>0,0</point>
<point>64,0</point>
<point>64,24</point>
<point>0,24</point>
<point>32,0</point>
<point>32,32</point>
<point>0,32</point>
</PhysicsShapePoints>
</object>

2
objects/o_radio_cubo.object.gmx
View file

@ -16,7 +16,7 @@
<PhysicsObjectGroup>1</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>3</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>15</PhysicsObjectFriction>
<PhysicsObjectFriction>25</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints>

2
objects/o_radio_palla.object.gmx
View file

@ -101,7 +101,7 @@
<PhysicsObjectGroup>1</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>3</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>15</PhysicsObjectFriction>
<PhysicsObjectFriction>25</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints>

2
objects/o_radio_palla_grande.object.gmx
View file

@ -16,7 +16,7 @@
<PhysicsObjectGroup>1</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>3</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>15</PhysicsObjectFriction>
<PhysicsObjectFriction>25</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints>

6
objects/o_radio_triangolo.object.gmx
View file

@ -16,12 +16,12 @@
<PhysicsObjectGroup>1</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>15</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>15</PhysicsObjectFriction>
<PhysicsObjectFriction>25</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints>
<point>0,0</point>
<point>16,0</point>
<point>8,0</point>
<point>16,16</point>
<point>0,16</point>
</PhysicsShapePoints>
</object>

6
objects/o_radio_triangolo_2.object.gmx
View file

@ -16,12 +16,12 @@
<PhysicsObjectGroup>1</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>15</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>15</PhysicsObjectFriction>
<PhysicsObjectFriction>25</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints>
<point>0,0</point>
<point>16,0</point>
<point>16,16</point>
<point>0,16</point>
<point>0,0</point>
</PhysicsShapePoints>
</object>

2
objects/stack.object.gmx
View file

@ -298,7 +298,7 @@
<argument>
<kind>1</kind>
<string>//Fai spawnare l'oggetto selezionato in base all'array stack_names.
if (selected = 10 || selected = 43 || selected = 44 || selected = 45 || selected = 46)
if (selected = 10 || selected = 43 || selected = 44 || selected = 45 || selected = 46 || selected = 34 || selected = 37 || selected = 40)
{
instance_create(floor((mouse_x div 32))*32,floor((mouse_y div 32))*32,stack_names[selected]);
}

2
scripts/scrcursor.gml
View file

@ -1,4 +1,4 @@
if (selected = 10 || selected = 43 || selected = 44 || selected = 45 || selected = 46)
if (selected = 10 || selected = 43 || selected = 44 || selected = 45 || selected = 46 || selected = 34 || selected = 37 || selected = 40)
{
draw_sprite_ext(object_get_sprite(stack_names[selected]), 0, floor((mouse_x div 32))*32,floor((mouse_y div 32))*32, 1, 1, 0, c_white, 0.4);
}

8
sprites/i_lock_blue.sprite.gmx
View file

@ -7,17 +7,17 @@
<sepmasks>0</sepmasks>
<bboxmode>0</bboxmode>
<bbox_left>0</bbox_left>
<bbox_right>63</bbox_right>
<bbox_right>31</bbox_right>
<bbox_top>0</bbox_top>
<bbox_bottom>23</bbox_bottom>
<bbox_bottom>31</bbox_bottom>
<HTile>0</HTile>
<VTile>0</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>64</width>
<height>24</height>
<width>32</width>
<height>32</height>
<frames>
<frame index="0">images\i_lock_blue_0.png</frame>
</frames>

8
sprites/i_lock_green.sprite.gmx
View file

@ -7,17 +7,17 @@
<sepmasks>0</sepmasks>
<bboxmode>0</bboxmode>
<bbox_left>0</bbox_left>
<bbox_right>63</bbox_right>
<bbox_right>31</bbox_right>
<bbox_top>0</bbox_top>
<bbox_bottom>23</bbox_bottom>
<bbox_bottom>31</bbox_bottom>
<HTile>0</HTile>
<VTile>0</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>64</width>
<height>24</height>
<width>32</width>
<height>32</height>
<frames>
<frame index="0">images\i_lock_green_0.png</frame>
</frames>

12
sprites/i_lock_red.sprite.gmx
View file

@ -1,23 +1,23 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<sprite>
<xorig>32</xorig>
<yorigin>12</yorigin>
<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>63</bbox_right>
<bbox_right>31</bbox_right>
<bbox_top>0</bbox_top>
<bbox_bottom>23</bbox_bottom>
<bbox_bottom>31</bbox_bottom>
<HTile>0</HTile>
<VTile>0</VTile>
<TextureGroups>
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>64</width>
<height>24</height>
<width>32</width>
<height>32</height>
<frames>
<frame index="0">images\i_lock_red_0.png</frame>
</frames>

BIN
sprites/images/i_lock_blue_0.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 141 B

After

Width:  |  Height:  |  Size: 130 B

BIN
sprites/images/i_lock_green_0.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 142 B

After

Width:  |  Height:  |  Size: 131 B

BIN
sprites/images/i_lock_red_0.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 140 B

After

Width:  |  Height:  |  Size: 129 B