Skip to content

Commit

Permalink
1.1
Browse files Browse the repository at this point in the history
Add iOS config.
Small cleanup.
Small main menu fixes.
Hello vk.com/game_maker ;)
  • Loading branch information
nkrapivin committed Aug 23, 2019
1 parent a83537e commit e883e89
Show file tree
Hide file tree
Showing 47 changed files with 81 additions and 119 deletions.
17 changes: 8 additions & 9 deletions Pingo.yyp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ How to download and play the game: <br />
Head over to game page on itch.io <br />
https://nkrapivindev.itch.io/pingo-gms2 <br />
Follow the Installation Instructions for the platform you want to play this game on. <br />

PS: Linux and macOS versions will be uploaded soon.
2 changes: 1 addition & 1 deletion objects/objMenuBtnPar/Step_0.gml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// @description highlight
if (point_in_rectangle(mouse_x,mouse_y,x,y,x+sprite_width,y+sprite_height))
if (position_meeting(mouse_x,mouse_y,object_index))
{
with (objMenuController)
{
Expand Down
Binary file added options/android/icons/hdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/android/icons/ldpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/android/icons/mdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/android/icons/xhdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/android/icons/xxhdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/android/icons/xxxhdpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions options/android/options_android.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added options/ios/icons/app/ipad_152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/app/ipad_76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/app/ipad_pro_167.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/app/iphone_120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/app/iphone_180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/itunes/itunes_1024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/notification/iphone_40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/notification/iphone_60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/settings/ipad_29.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/settings/ipad_58.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/settings/iphone_58.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/settings/iphone_87.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/spotlight/ipad_40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/spotlight/ipad_80.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/spotlight/iphone_120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/icons/spotlight/iphone_80.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 27 additions & 27 deletions options/ios/options_ios.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added options/ios/splash/ipad_7_landscape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/splash/ipad_landscape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/splash/ipad_retina_7_landscape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added options/ios/splash/ipad_retina_landscape.png
Binary file added options/ios/splash/iphone_8_55_landscape.png
Binary file added options/ios/splash/iphone_x_landscape.png
Binary file added options/ios/splash/iphone_xr_landscape.png
Binary file added options/ios/splash/iphone_xs_max_landscape.png
2 changes: 1 addition & 1 deletion options/linux/options_linux.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions options/mac/options_mac.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions options/main/inherited/options_main.inherited.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion options/windows/options_windows.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 0 additions & 44 deletions scripts/scrDrawDoorElement/scrDrawDoorElement.gml

This file was deleted.

8 changes: 0 additions & 8 deletions scripts/scrDrawDoorElement/scrDrawDoorElement.yy

This file was deleted.

8 changes: 4 additions & 4 deletions sprites/sprMenuBtn1/sprMenuBtn1.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions sprites/sprMenuBtn2/sprMenuBtn2.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions sprites/sprMenuBtn3/sprMenuBtn3.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions views/7c119460-785b-4d24-812d-a2aa3a616563.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion views/9551f335-486f-407f-b695-ddd79a44904c.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions views/e9957afe-3e89-4ef8-8818-608fa2bc82d4.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e883e89

Please sign in to comment.