Skip to content

Commit 03bc576

Browse files
committed
update project
1 parent b43408c commit 03bc576

File tree

74 files changed

+230
-209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+230
-209
lines changed

2.3/objects/obj_screen/Alarm_0.gml

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

2.3/objects/obj_screen/Create_0.gml

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

2.3/objects/obj_screen/Step_1.gml

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

2.3/options/ios/options_ios.yy

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

2.3/options/tvos/options_tvos.yy

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

2.3/scripts/auto_frame/auto_frame.gml

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

2.3/scripts/math_structs/math_structs.gml

Lines changed: 0 additions & 9 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.

2.3/auto-framer.yyp renamed to GMS 2.3/auto-framer.yyp

Lines changed: 13 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

2.3/fonts/fnt_test/fnt_test.yy renamed to GMS 2.3/fonts/fnt_demo/fnt_demo.yy

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GMS 2.3/notes/info/info.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Version: 1.1

GMS 2.3/notes/info/info.yy

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GMS 2.3/objects/obj_demo/Alarm_0.gml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
var _d = new Vector2(window_get_width(), window_get_height());
2+
3+
auto_frame(_d);

GMS 2.3/objects/obj_demo/Create_0.gml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
if (track_window_resize) prev_win_size = new Vector2(window_get_width(), window_get_height());
2+
3+
fixed_display_size = !(os_type == os_ios || os_type == os_android);
4+
var _d = new Vector2(0, 0);
5+
6+
if (fixed_display_size) {
7+
_d.y = fixedDisplay_height;
8+
_d.x = fixedDisplay_width;
9+
window_set_rectangle(abs(display_get_width() - _d.x) / 2, abs(display_get_height() - _d.y) / 2, _d.x, _d.y);
10+
}
11+
12+
else {
13+
_d.y = display_get_height();
14+
_d.x = display_get_width();
15+
window_set_size(_d.x, _d.y);
16+
}
17+
18+
auto_frame(_d);
19+
20+
window_size = new Vector2(_d.x, _d.y);

2.3/objects/obj_screen/Draw_64.gml renamed to GMS 2.3/objects/obj_demo/Draw_64.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if (draw_stats) {
44
draw_set_halign(fa_left);
55

66
draw_text(0, 0, "Display: " + string(display_get_width()) + " x " + string(display_get_height()) + "\n" +
7-
"Window: " + string(window_size.w) + " x " + string(window_size.h) + "\n" +
7+
"Window: " + string(window_size.x) + " x " + string(window_size.y) + "\n" +
88
"Viewport: " + string(view_get_wport(0)) + " x " + string(view_get_hport(0)) + "\n" +
99
"Camera: " + string(camera_get_view_width(view_camera[0])) + " x " + string(camera_get_view_height(view_camera[0])) + " / " + string(camera_get_view_x(view_camera[0])) + ", " + string(camera_get_view_y(view_camera[0])) + "\n" +
1010
"Application Surface: " + string(surface_get_width(application_surface)) + " x " + string(surface_get_height(application_surface)) + "\n" +

GMS 2.3/objects/obj_demo/Step_1.gml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
if (track_window_resize) {
2+
var _cur_win_size = new Vector2(window_get_width(), window_get_height());
3+
4+
if (_cur_win_size.x != prev_win_size.x || _cur_win_size.y != prev_win_size.y) {
5+
alarm[0] = 5;
6+
}
7+
8+
prev_win_size.x = _cur_win_size.x;
9+
prev_win_size.y = _cur_win_size.y;
10+
}

2.3/objects/obj_screen/obj_screen.yy renamed to GMS 2.3/objects/obj_demo/obj_demo.yy

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

2.3/options/amazonfire/options_amazonfire.yy renamed to GMS 2.3/options/amazonfire/options_amazonfire.yy

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)