Skip to content

Commit

Permalink
New main menu
Browse files Browse the repository at this point in the history
  • Loading branch information
Monis Khan committed Nov 17, 2015
1 parent 6722458 commit ff52ce9
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions cloned.gmx/background/back_main.background.gmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<TextureGroup0>0</TextureGroup0>
</TextureGroups>
<For3D>0</For3D>
<width>2048</width>
<height>1536</height>
<width>1024</width>
<height>768</height>
<data>images\back_main.png</data>
</background>
Binary file modified cloned.gmx/background/images/back_main.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions cloned.gmx/cloned.project.gmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
<background>background\back_panda</background>
<background>background\fore_panda</background>
<background>background\back_win</background>
<background>background\back_main</background>
</backgrounds>
<paths name="paths"/>
<scripts name="scripts">
Expand Down
2 changes: 1 addition & 1 deletion cloned.gmx/objects/obj_referee.object.gmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</argument>
<argument>
<kind>0</kind>
<string>900</string>
<string>1800</string>
</argument>
</arguments>
</action>
Expand Down
4 changes: 1 addition & 3 deletions cloned.gmx/rooms/rm_mainMenu.room.gmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<yoffset>0</yoffset>
</makerSettings>
<backgrounds>
<background visible="-1" foreground="0" name="back_charselect" x="0" y="0" htiled="0" vtiled="0" hspeed="0" vspeed="0" stretch="-1"/>
<background visible="-1" foreground="0" name="back_main" x="0" y="0" htiled="0" vtiled="0" hspeed="0" vspeed="0" stretch="-1"/>
<background visible="-1" foreground="0" name="" x="0" y="0" htiled="0" vtiled="0" hspeed="0" vspeed="0" stretch="-1"/>
<background visible="0" foreground="0" name="" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
<background visible="0" foreground="0" name="" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
Expand All @@ -52,8 +52,6 @@
</views>
<instances>
<instance objName="obj_main_menu" x="96" y="160" name="inst_F86AAD6E" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="obj_wukong" x="224" y="704" name="inst_566F73CA" locked="0" code="" scaleX="2" scaleY="2" colour="4294967295" rotation="0"/>
<instance objName="obj_wukong" x="800" y="704" name="inst_71F7D2BF" locked="0" code="" scaleX="-2" scaleY="2" colour="4294967295" rotation="0"/>
</instances>
<tiles/>
<PhysicsWorld>0</PhysicsWorld>
Expand Down
16 changes: 8 additions & 8 deletions cloned.gmx/rooms/rm_win.room.gmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
<background visible="0" foreground="0" name="" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
</backgrounds>
<views>
<view visible="0" objName="" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
<view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="1024" hview="768" xport="0" yport="0" wport="1024" hport="768" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
</views>
<instances>
<instance objName="obj_win_screen" x="256" y="256" name="inst_A247BC9B" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
Expand Down
2 changes: 1 addition & 1 deletion cloned.gmx/scripts/script_referee_draw.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if(!global.training_mode && !round_started) {
// exit;
}

if(round_started && timer>(900-30)) {
if(round_started && timer>(1800-30)) {
script_draw_stroked_text("Fight!",view_xview[0]+view_wview[0]/2, 384, .5, c_orange, c_yellow, fa_center, fa_center, 2);
}

Expand Down

0 comments on commit ff52ce9

Please sign in to comment.