Skip to content

Commit 1997f22

Browse files
committed
Fixed DnD object index, created extension
1 parent b0f5f18 commit 1997f22

File tree

14 files changed

+689
-644
lines changed

14 files changed

+689
-644
lines changed

PushEd.gmez

216 KB
Binary file not shown.

PushEd.gmx/Configs/Default.config.gmx

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -677,20 +677,5 @@
677677
<option_xbone_texture_page>1024</option_xbone_texture_page>
678678
<option_xbone_title_id></option_xbone_title_id>
679679
</Options>
680-
<ConfigConstants>
681-
<constants number="12">
682-
<constant name="PEd_POS_X">"x"</constant>
683-
<constant name="PEd_POS_Y">"y"</constant>
684-
<constant name="PEd_POS_Z">"z"</constant>
685-
<constant name="PEd_ROT_X">"rotX"</constant>
686-
<constant name="PEd_ROT_Y">"rotY"</constant>
687-
<constant name="PEd_ROT_Z">"image_angle"</constant>
688-
<constant name="PEd_SCALE_X">"image_xscale"</constant>
689-
<constant name="PEd_SCALE_Y">"image_yscale"</constant>
690-
<constant name="PEd_SCALE_Z">"scaleZ"</constant>
691-
<constant name="PEd_COLOUR">"image_blend"</constant>
692-
<constant name="PEd_ALPHA">"image_alpha"</constant>
693-
<constant name="PEd_CREATE_DUMMY_2D">true</constant>
694-
</constants>
695-
</ConfigConstants>
680+
<ConfigConstants/>
696681
</Config>

PushEd.gmx/PushEd.project.gmx

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
<Configs name="configs">
44
<Config>Configs\Default</Config>
55
</Configs>
6-
<NewExtensions/>
6+
<NewExtensions>
7+
<extension index="0">extensions\PushEd</extension>
8+
</NewExtensions>
79
<sounds name="sound"/>
810
<sprites name="sprites">
911
<sprites name="PushEd">
@@ -21,14 +23,18 @@
2123
<sprite>sprites\PEd_guiSprWarning</sprite>
2224
<sprite>sprites\PEd_guiSprWindowCross</sprite>
2325
</sprites>
24-
<sprite>sprites\PEd_sprTest</sprite>
2526
<sprite>sprites\PEd_sprDummy2D</sprite>
2627
</sprites>
28+
<sprites name="Example">
29+
<sprite>sprites\sprSmiley</sprite>
30+
</sprites>
2731
</sprites>
2832
<backgrounds name="background">
2933
<backgrounds name="PushEd">
3034
<background>background\PEd_bgrDef</background>
31-
<background>background\PEd_bgrTiles</background>
35+
</backgrounds>
36+
<backgrounds name="Example">
37+
<background>background\bgrTiles</background>
3238
</backgrounds>
3339
</backgrounds>
3440
<paths name="paths"/>
@@ -712,14 +718,6 @@
712718
</fonts>
713719
</fonts>
714720
<objects name="objects">
715-
<objects name="PEdExample">
716-
<object>objects\oBlank</object>
717-
<object>objects\oBlock</object>
718-
<object>objects\oCone</object>
719-
<object>objects\oCylinder</object>
720-
<object>objects\oEllipsoid</object>
721-
<object>objects\oSprite</object>
722-
</objects>
723721
<objects name="PushEd">
724722
<object>objects\PEd_oEditor</object>
725723
<object>objects\PEd_oObject</object>
@@ -728,6 +726,14 @@
728726
<object>objects\PEd_oPivot</object>
729727
<object>objects\PEd_oPlay</object>
730728
</objects>
729+
<objects name="Example">
730+
<object>objects\oBlank</object>
731+
<object>objects\oBlock</object>
732+
<object>objects\oCone</object>
733+
<object>objects\oCylinder</object>
734+
<object>objects\oEllipsoid</object>
735+
<object>objects\oSprite</object>
736+
</objects>
731737
</objects>
732738
<rooms name="rooms">
733739
<rooms name="PushEd">

PushEd.gmx/background/PEd_bgrTiles.background.gmx renamed to PushEd.gmx/background/bgrTiles.background.gmx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
<For3D>0</For3D>
1616
<width>256</width>
1717
<height>256</height>
18-
<data>images\PEd_bgrTiles.png</data>
18+
<data>images\bgrTiles.png</data>
1919
</background>
2.4 KB
Loading

PushEd.gmx/extensions/PushEd.extension.gmx

Lines changed: 664 additions & 0 deletions
Large diffs are not rendered by default.

PushEd.gmx/extensions/PushEd.gml

Whitespace-only changes.

PushEd.gmx/extensions/PushEd/PushEd.gml

Whitespace-only changes.

PushEd.gmx/extensions/yymanifest.xml

Lines changed: 0 additions & 611 deletions
This file was deleted.

PushEd.gmx/objects/oSprite.object.gmx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
22
<object>
3-
<spriteName>PEd_sprTest</spriteName>
3+
<spriteName>sprSmiley</spriteName>
44
<solid>0</solid>
55
<visible>-1</visible>
66
<depth>0</depth>

0 commit comments

Comments
 (0)