diff --git a/Configs/Default.config.gmx b/Configs/Default.config.gmx index 9ecf9c4..d61caf2 100644 --- a/Configs/Default.config.gmx +++ b/Configs/Default.config.gmx @@ -34,6 +34,12 @@ Configs\Default\android\icons\icon36.png Configs\Default\android\icons\icon48.png Configs\Default\android\icons\icon72.png + Configs\Default\android\icons\icon_hdpi.png + Configs\Default\android\icons\icon_ldpi.png + Configs\Default\android\icons\icon_mdpi.png + Configs\Default\android\icons\icon_xhdpi.png + Configs\Default\android\icons\icon_xxhdpi.png + Configs\Default\android\icons\icon_xxxhdpi.png 0 0 @@ -51,7 +57,9 @@ true + true true + true 2 Configs\Default\android\icons\ouyaIcon.png companyname @@ -61,19 +69,25 @@ 0 0 + false + + -1 Configs\Default\android\splash.png 1024 0 True + 1 Royal Games nil + false false false true 0 Royal Games - Stack True + 0 false @@ -92,6 +106,7 @@ Supersonic Ads True False + Created with GameMaker:Studio False 0 @@ -104,12 +119,15 @@ -1 -1 + true False index.html -1 + true Configs\Default\html5\splash.png 2048 0 + true False nil 0 @@ -129,6 +147,7 @@ 0 0 + Configs\Default\ios\icons\icon114.png Configs\Default\ios\icons\icon120.png @@ -144,6 +163,8 @@ Configs\Default\ios\iPadRetinasplash.png Configs\Default\ios\iPadsplash.png Configs\Default\ios\iPhone5splash.png + Configs\Default\ios\iPhone6splash.png + Configs\Default\ios\iPhone6Plussplash.png Configs\Default\ios\IphoneRetinasplash.png Configs\Default\ios\iPhonesplash.png 1 @@ -153,6 +174,8 @@ -1 -1 < Press refresh to fetch provisioning list from Mac> + false + -1 Configs\Default\ios\splash.png 1024 @@ -202,11 +225,51 @@ true 0 0 + 0 + true + 1 + 0 + + + + IV0002-NPXS00020_00-GAMEMAKERGAME001 + 0xc0a3b3641c2ad1ef23153a48a3e12fe7 + 0 + -1 + 2048 + 0 + false + true + 1 + 0 + + + IV0002-NPXS29129_00-APP0990000000022 + GvE6xCpZxd96scOUGuLPbuLp8O800B0s + 0 + -1 + 2048 + 0 + false + true + 1 + 0 + + + + EP9000-NPXB01693_00-GMSTUDIORUNNER00 + 5MHZUpPpbQLKAkttvpJzA6EaWgsiWv1w + false + 0 + -1 + 2048 true 0 true -1 true + 0 + True true true @@ -229,11 +292,14 @@ 0 + Configs\Default\tizen\icon117.png + true 1 0 0 + false 1 Configs\Default\tizen\splash.png 1024 @@ -346,6 +412,7 @@ Configs\Default\WinPhone\IconicWide.png + true -1 -1 1 @@ -354,12 +421,31 @@ YourPublisherName f47823f0-220d-459a-bf68-b6ea984b24a8 0 + -1 -1 -1 -1 1024 0 False + #464646 + 0 + Your Description + boom + -1 + light + true + 1 + 0 + Company Name + Company Display Name + false + 0 + -1 + + #464646 + 1024 + diff --git a/boom.project.gmx b/boom.project.gmx index 8c8da06..656a282 100644 --- a/boom.project.gmx +++ b/boom.project.gmx @@ -1,5 +1,5 @@ - + Configs\Default @@ -198,6 +198,7 @@ objects\o_wall_norm_R_D objects\o_wall_norm_L_U objects\o_wall_norm_move_h + objects\o_wall_norm_move_v objects\o_wall_norm_stomp_h_r @@ -279,6 +280,7 @@ rooms\r_test + rooms\r_hires rooms\r_paracadute_mp rooms\r_CD rooms\r_grav_classic_p diff --git a/objects/o_wall_norm_move_v.object.gmx b/objects/o_wall_norm_move_v.object.gmx new file mode 100644 index 0000000..011a438 --- /dev/null +++ b/objects/o_wall_norm_move_v.object.gmx @@ -0,0 +1,250 @@ + + + i_moving_h + -1 + -1 + 0 + 0 + o_generale + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + phy_linear_velocity_y = +64; + + + + + + 1 + 301 + 0 + -1 + 0 + -1 + 1 + action_set_alarm + + self + 0 + 0 + + + 0 + 90 + + + 4 + 0 + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + phy_linear_velocity_y = +64; + + + + + + 1 + 301 + 0 + -1 + 0 + -1 + 1 + action_set_alarm + + self + 0 + 0 + + + 0 + 90 + + + 4 + 0 + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + phy_linear_velocity_y = -64; + + + + + + 1 + 301 + 0 + -1 + 0 + -1 + 1 + action_set_alarm + + self + 0 + 0 + + + 0 + 90 + + + 4 + 1 + + + + + + + 1 + 612 + 0 + 0 + -1 + -1 + 1 + action_if_variable + + self + 0 + 0 + + + 0 + debug_mode + + + 0 + true + + + 4 + 0 + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + draw_set_color(c_ltgray); +physics_draw_debug(); + + + + + + 1 + 421 + 3 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 500 + 0 + 0 + 0 + 0 + 2 + + draw_self(); + self + 0 + 0 + + + + -1 + 0 + 1 + 0 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + 0 + -1 + + 0,0 + 32,0 + 32,32 + 0,32 + + diff --git a/objects/s_display_menu.object.gmx b/objects/s_display_menu.object.gmx index d013595..cc088e0 100644 --- a/objects/s_display_menu.object.gmx +++ b/objects/s_display_menu.object.gmx @@ -8,33 +8,7 @@ <undefined> <undefined> - - - 1 - 301 - 0 - -1 - 0 - -1 - 1 - action_set_alarm - - self - 0 - 0 - - - 0 - 1 - - - 4 - 0 - - - - - + 1 201 @@ -55,7 +29,7 @@ 0 - irandom(640) + irandom(room_width) 0 @@ -63,30 +37,6 @@ - - 1 - 301 - 0 - -1 - 0 - -1 - 1 - action_set_alarm - - self - 0 - 0 - - - 0 - 3 - - - 4 - 0 - - - 0 diff --git a/rooms/c_boomer.room.gmx b/rooms/c_boomer.room.gmx index 8a6462b..bca9024 100644 --- a/rooms/c_boomer.room.gmx +++ b/rooms/c_boomer.room.gmx @@ -13,6 +13,7 @@ 0 -1 + -1 -1 1049 diff --git a/rooms/menu.room.gmx b/rooms/menu.room.gmx index 6bf169a..0a41c50 100644 --- a/rooms/menu.room.gmx +++ b/rooms/menu.room.gmx @@ -1,8 +1,8 @@ - 640 - 480 + 1024 + 768 32 32 0 @@ -13,6 +13,7 @@ 0 -1 + -1 -1 875 @@ -50,18 +51,18 @@ - - - - + + + + - + - + - + @@ -69,47 +70,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + -1 diff --git a/rooms/menu_roll.room.gmx b/rooms/menu_roll.room.gmx index 658908e..f43f115 100644 --- a/rooms/menu_roll.room.gmx +++ b/rooms/menu_roll.room.gmx @@ -13,6 +13,7 @@ room_specified = r_CD; -1 -1 + -1 -1 875 diff --git a/rooms/r_CD.room.gmx b/rooms/r_CD.room.gmx index 0be568b..36103d8 100644 --- a/rooms/r_CD.room.gmx +++ b/rooms/r_CD.room.gmx @@ -13,6 +13,7 @@ -1 -1 + -1 -1 1049 diff --git a/rooms/r_bigres_mp.room.gmx b/rooms/r_bigres_mp.room.gmx index c937a13..afa2a38 100644 --- a/rooms/r_bigres_mp.room.gmx +++ b/rooms/r_bigres_mp.room.gmx @@ -13,6 +13,7 @@ -1 -1 + -1 -1 901 diff --git a/rooms/r_bombtest.room.gmx b/rooms/r_bombtest.room.gmx index 1b7c131..703915e 100644 --- a/rooms/r_bombtest.room.gmx +++ b/rooms/r_bombtest.room.gmx @@ -13,6 +13,7 @@ time = 480; -1 -1 + -1 -1 1049 diff --git a/rooms/r_grav_classic_p.room.gmx b/rooms/r_grav_classic_p.room.gmx index afa7aba..879d7c5 100644 --- a/rooms/r_grav_classic_p.room.gmx +++ b/rooms/r_grav_classic_p.room.gmx @@ -13,6 +13,7 @@ -1 -1 + -1 -1 1050 diff --git a/rooms/r_hires.room.gmx b/rooms/r_hires.room.gmx new file mode 100644 index 0000000..1b0efdd --- /dev/null +++ b/rooms/r_hires.room.gmx @@ -0,0 +1,395 @@ + + + + 2560 + 768 + 32 + 32 + 0 + 60 + 0 + 64 + -1 + + -1 + -1 + -1 + + -1 + 1050 + 687 + -1 + -1 + -1 + -1 + -1 + 0 + 0 + -1 + 0 + -248 + -210 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1 + 0 + 0 + 640 + 480 + 0 + 60 + 0.100000001490116 + diff --git a/rooms/r_jonnys.room.gmx b/rooms/r_jonnys.room.gmx index 6923d8e..f4ef439 100644 --- a/rooms/r_jonnys.room.gmx +++ b/rooms/r_jonnys.room.gmx @@ -13,6 +13,7 @@ -1 -1 + -1 -1 1050 diff --git a/rooms/r_paracadute_mp.room.gmx b/rooms/r_paracadute_mp.room.gmx index bfe6a58..9633ca7 100644 --- a/rooms/r_paracadute_mp.room.gmx +++ b/rooms/r_paracadute_mp.room.gmx @@ -13,6 +13,7 @@ -1 -1 + -1 -1 901 diff --git a/rooms/r_test.room.gmx b/rooms/r_test.room.gmx index 19e4cbc..a8cd62c 100644 --- a/rooms/r_test.room.gmx +++ b/rooms/r_test.room.gmx @@ -13,6 +13,7 @@ -1 -1 + -1 -1 1050 diff --git a/rooms/s_classic.room.gmx b/rooms/s_classic.room.gmx index a027123..85e3eee 100644 --- a/rooms/s_classic.room.gmx +++ b/rooms/s_classic.room.gmx @@ -13,6 +13,7 @@ 0 -1 + -1 -1 838 diff --git a/rooms/s_lifttest.room.gmx b/rooms/s_lifttest.room.gmx index 4fad9eb..6812234 100644 --- a/rooms/s_lifttest.room.gmx +++ b/rooms/s_lifttest.room.gmx @@ -13,6 +13,7 @@ 0 -1 + -1 -1 980 diff --git a/rooms/s_maxi.room.gmx b/rooms/s_maxi.room.gmx index 801312f..a4b5170 100644 --- a/rooms/s_maxi.room.gmx +++ b/rooms/s_maxi.room.gmx @@ -13,6 +13,7 @@ 0 -1 + -1 -1 942 diff --git a/rooms/s_sandbox.room.gmx b/rooms/s_sandbox.room.gmx index c727f11..3eba40b 100644 --- a/rooms/s_sandbox.room.gmx +++ b/rooms/s_sandbox.room.gmx @@ -13,6 +13,7 @@ 0 -1 + -1 -1 812 diff --git a/rooms/s_sea.room.gmx b/rooms/s_sea.room.gmx index 5a196eb..0704a8b 100644 --- a/rooms/s_sea.room.gmx +++ b/rooms/s_sea.room.gmx @@ -13,6 +13,7 @@ 0 -1 + -1 -1 980 diff --git a/rooms/s_sidewalls.room.gmx b/rooms/s_sidewalls.room.gmx index a4fae69..e20c122 100644 --- a/rooms/s_sidewalls.room.gmx +++ b/rooms/s_sidewalls.room.gmx @@ -13,6 +13,7 @@ 0 -1 + -1 -1 760 diff --git a/rooms/s_stairs.room.gmx b/rooms/s_stairs.room.gmx index 8dbf132..307b67f 100644 --- a/rooms/s_stairs.room.gmx +++ b/rooms/s_stairs.room.gmx @@ -13,6 +13,7 @@ 0 -1 + -1 -1 786 diff --git a/rooms/s_twotris.room.gmx b/rooms/s_twotris.room.gmx index 39ebeb1..fba64b2 100644 --- a/rooms/s_twotris.room.gmx +++ b/rooms/s_twotris.room.gmx @@ -13,6 +13,7 @@ 0 -1 + -1 -1 980 diff --git a/rooms/t_classic.room.gmx b/rooms/t_classic.room.gmx index 95782ef..c6f6cbd 100644 --- a/rooms/t_classic.room.gmx +++ b/rooms/t_classic.room.gmx @@ -13,6 +13,7 @@ -1 -1 + -1 -1 1050 diff --git a/scripts/togglefullscreen.gml b/scripts/togglefullscreen.gml index 4b2dd4a..5ece605 100644 --- a/scripts/togglefullscreen.gml +++ b/scripts/togglefullscreen.gml @@ -6,4 +6,4 @@ if window_get_fullscreen() = true else { window_set_fullscreen(true); - } + } \ No newline at end of file