update project

mstop4 · May 2, 2021 · 03bc576 · 03bc576
1 parent b43408c
commit 03bc576
Show file tree

Hide file tree

Showing 74 changed files with 230 additions and 209 deletions.
diff --git a/2.3/objects/obj_screen/Alarm_0.gml b/2.3/objects/obj_screen/Alarm_0.gml
diff --git a/2.3/objects/obj_screen/Create_0.gml b/2.3/objects/obj_screen/Create_0.gml
diff --git a/2.3/objects/obj_screen/Step_1.gml b/2.3/objects/obj_screen/Step_1.gml
diff --git a/2.3/options/ios/options_ios.yy b/2.3/options/ios/options_ios.yy
diff --git a/2.3/options/tvos/options_tvos.yy b/2.3/options/tvos/options_tvos.yy
diff --git a/2.3/scripts/auto_frame/auto_frame.gml b/2.3/scripts/auto_frame/auto_frame.gml
diff --git a/2.3/scripts/math_structs/math_structs.gml b/2.3/scripts/math_structs/math_structs.gml
diff --git a/2.2/fonts/fnt_test/fnt_test.old.png → GMS 2.2.5/fonts/fnt_test/fnt_test.old.png b/2.2/fonts/fnt_test/fnt_test.old.png → GMS 2.2.5/fonts/fnt_test/fnt_test.old.png
diff --git a/2.2/fonts/fnt_test/fnt_test.old.yy → GMS 2.2.5/fonts/fnt_test/fnt_test.old.yy b/2.2/fonts/fnt_test/fnt_test.old.yy → GMS 2.2.5/fonts/fnt_test/fnt_test.old.yy
diff --git a/2.2/fonts/fnt_test/fnt_test.png → GMS 2.2.5/fonts/fnt_test/fnt_test.png b/2.2/fonts/fnt_test/fnt_test.png → GMS 2.2.5/fonts/fnt_test/fnt_test.png
diff --git a/2.2/fonts/fnt_test/fnt_test.yy → GMS 2.2.5/fonts/fnt_test/fnt_test.yy b/2.2/fonts/fnt_test/fnt_test.yy → GMS 2.2.5/fonts/fnt_test/fnt_test.yy
diff --git a/2.2/objects/obj_screen/Alarm_0.gml → GMS 2.2.5/objects/obj_screen/Alarm_0.gml b/2.2/objects/obj_screen/Alarm_0.gml → GMS 2.2.5/objects/obj_screen/Alarm_0.gml
diff --git a/2.2/objects/obj_screen/Create_0.gml → GMS 2.2.5/objects/obj_screen/Create_0.gml b/2.2/objects/obj_screen/Create_0.gml → GMS 2.2.5/objects/obj_screen/Create_0.gml
diff --git a/2.2/objects/obj_screen/Draw_0.gml → GMS 2.2.5/objects/obj_screen/Draw_0.gml b/2.2/objects/obj_screen/Draw_0.gml → GMS 2.2.5/objects/obj_screen/Draw_0.gml
diff --git a/2.2/objects/obj_screen/Draw_64.gml → GMS 2.2.5/objects/obj_screen/Draw_64.gml b/2.2/objects/obj_screen/Draw_64.gml → GMS 2.2.5/objects/obj_screen/Draw_64.gml
diff --git a/2.2/objects/obj_screen/Step_1.gml → GMS 2.2.5/objects/obj_screen/Step_1.gml b/2.2/objects/obj_screen/Step_1.gml → GMS 2.2.5/objects/obj_screen/Step_1.gml
diff --git a/2.2/objects/obj_screen/obj_screen.yy → GMS 2.2.5/objects/obj_screen/obj_screen.yy b/2.2/objects/obj_screen/obj_screen.yy → GMS 2.2.5/objects/obj_screen/obj_screen.yy
diff --git a/2.2/options/amazonfire/options_amazonfire.yy → .../options/amazonfire/options_amazonfire.yy b/2.2/options/amazonfire/options_amazonfire.yy → .../options/amazonfire/options_amazonfire.yy
diff --git a/2.2/options/android/options_android.yy → GMS 2.2.5/options/android/options_android.yy b/2.2/options/android/options_android.yy → GMS 2.2.5/options/android/options_android.yy
diff --git a/2.2/options/html5/options_html5.yy → GMS 2.2.5/options/html5/options_html5.yy b/2.2/options/html5/options_html5.yy → GMS 2.2.5/options/html5/options_html5.yy
diff --git a/2.2/options/ios/options_ios.yy → GMS 2.2.5/options/ios/options_ios.yy b/2.2/options/ios/options_ios.yy → GMS 2.2.5/options/ios/options_ios.yy
diff --git a/2.2/options/linux/options_linux.yy → GMS 2.2.5/options/linux/options_linux.yy b/2.2/options/linux/options_linux.yy → GMS 2.2.5/options/linux/options_linux.yy
diff --git a/2.2/options/mac/options_mac.yy → GMS 2.2.5/options/mac/options_mac.yy b/2.2/options/mac/options_mac.yy → GMS 2.2.5/options/mac/options_mac.yy
diff --git a/.../main/inherited/options_main.inherited.yy → .../main/inherited/options_main.inherited.yy b/.../main/inherited/options_main.inherited.yy → .../main/inherited/options_main.inherited.yy
diff --git a/2.2/options/tvos/options_tvos.yy → GMS 2.2.5/options/tvos/options_tvos.yy b/2.2/options/tvos/options_tvos.yy → GMS 2.2.5/options/tvos/options_tvos.yy
diff --git a/2.2/options/windows/options_windows.yy → GMS 2.2.5/options/windows/options_windows.yy b/2.2/options/windows/options_windows.yy → GMS 2.2.5/options/windows/options_windows.yy
diff --git a/2.2/readme.md → GMS 2.2.5/readme.md b/2.2/readme.md → GMS 2.2.5/readme.md
diff --git a/2.2/rooms/room0/room0.yy → GMS 2.2.5/rooms/room0/room0.yy b/2.2/rooms/room0/room0.yy → GMS 2.2.5/rooms/room0/room0.yy
diff --git a/2.2/screentest.yyp → GMS 2.2.5/screentest.yyp b/2.2/screentest.yyp → GMS 2.2.5/screentest.yyp
diff --git a/2.2/scripts/auto_frame/auto_frame.gml → GMS 2.2.5/scripts/auto_frame/auto_frame.gml b/2.2/scripts/auto_frame/auto_frame.gml → GMS 2.2.5/scripts/auto_frame/auto_frame.gml
diff --git a/2.2/scripts/auto_frame/auto_frame.yy → GMS 2.2.5/scripts/auto_frame/auto_frame.yy b/2.2/scripts/auto_frame/auto_frame.yy → GMS 2.2.5/scripts/auto_frame/auto_frame.yy
diff --git a/...s/09ec9eb7-b0a8-42e1-8746-ebf08f365083.yy → ...s/09ec9eb7-b0a8-42e1-8746-ebf08f365083.yy b/...s/09ec9eb7-b0a8-42e1-8746-ebf08f365083.yy → ...s/09ec9eb7-b0a8-42e1-8746-ebf08f365083.yy
diff --git a/...s/2f36dcba-4d90-4201-843f-29b63735c3f7.yy → ...s/2f36dcba-4d90-4201-843f-29b63735c3f7.yy b/...s/2f36dcba-4d90-4201-843f-29b63735c3f7.yy → ...s/2f36dcba-4d90-4201-843f-29b63735c3f7.yy
diff --git a/...s/4058e9a4-4a0f-44db-9b0f-d0b2a5a8d8d2.yy → ...s/4058e9a4-4a0f-44db-9b0f-d0b2a5a8d8d2.yy b/...s/4058e9a4-4a0f-44db-9b0f-d0b2a5a8d8d2.yy → ...s/4058e9a4-4a0f-44db-9b0f-d0b2a5a8d8d2.yy
diff --git a/...s/4a9082b5-6f3d-4775-b688-14176b0ab2c1.yy → ...s/4a9082b5-6f3d-4775-b688-14176b0ab2c1.yy b/...s/4a9082b5-6f3d-4775-b688-14176b0ab2c1.yy → ...s/4a9082b5-6f3d-4775-b688-14176b0ab2c1.yy
diff --git a/...s/6128f633-4f69-4e82-8d3a-dc98b34bad72.yy → ...s/6128f633-4f69-4e82-8d3a-dc98b34bad72.yy b/...s/6128f633-4f69-4e82-8d3a-dc98b34bad72.yy → ...s/6128f633-4f69-4e82-8d3a-dc98b34bad72.yy
diff --git a/...s/616a579f-03b1-491a-9b8e-53c255cdde18.yy → ...s/616a579f-03b1-491a-9b8e-53c255cdde18.yy b/...s/616a579f-03b1-491a-9b8e-53c255cdde18.yy → ...s/616a579f-03b1-491a-9b8e-53c255cdde18.yy
diff --git a/...s/6189c0ea-e7d2-47f0-81e5-8d0f7c536cf4.yy → ...s/6189c0ea-e7d2-47f0-81e5-8d0f7c536cf4.yy b/...s/6189c0ea-e7d2-47f0-81e5-8d0f7c536cf4.yy → ...s/6189c0ea-e7d2-47f0-81e5-8d0f7c536cf4.yy
diff --git a/...s/7c9babef-4a69-4faf-998d-4f33b589b01c.yy → ...s/7c9babef-4a69-4faf-998d-4f33b589b01c.yy b/...s/7c9babef-4a69-4faf-998d-4f33b589b01c.yy → ...s/7c9babef-4a69-4faf-998d-4f33b589b01c.yy
diff --git a/...s/87c02859-7bd0-4d08-bb70-d05e96c47331.yy → ...s/87c02859-7bd0-4d08-bb70-d05e96c47331.yy b/...s/87c02859-7bd0-4d08-bb70-d05e96c47331.yy → ...s/87c02859-7bd0-4d08-bb70-d05e96c47331.yy
diff --git a/...s/8b0885d5-480e-439a-9ceb-4b317b43b6ab.yy → ...s/8b0885d5-480e-439a-9ceb-4b317b43b6ab.yy b/...s/8b0885d5-480e-439a-9ceb-4b317b43b6ab.yy → ...s/8b0885d5-480e-439a-9ceb-4b317b43b6ab.yy
diff --git a/...s/9625e45d-805a-4246-8a7f-34604176f671.yy → ...s/9625e45d-805a-4246-8a7f-34604176f671.yy b/...s/9625e45d-805a-4246-8a7f-34604176f671.yy → ...s/9625e45d-805a-4246-8a7f-34604176f671.yy
diff --git a/...s/ad481647-445c-4921-88d2-e1cdf34d04e9.yy → ...s/ad481647-445c-4921-88d2-e1cdf34d04e9.yy b/...s/ad481647-445c-4921-88d2-e1cdf34d04e9.yy → ...s/ad481647-445c-4921-88d2-e1cdf34d04e9.yy
diff --git a/...s/af2c01d8-f0ad-4870-8d3c-b600c509e98a.yy → ...s/af2c01d8-f0ad-4870-8d3c-b600c509e98a.yy b/...s/af2c01d8-f0ad-4870-8d3c-b600c509e98a.yy → ...s/af2c01d8-f0ad-4870-8d3c-b600c509e98a.yy
diff --git a/...s/c37ca4ef-dcf6-4211-a2a4-128aa492cd07.yy → ...s/c37ca4ef-dcf6-4211-a2a4-128aa492cd07.yy b/...s/c37ca4ef-dcf6-4211-a2a4-128aa492cd07.yy → ...s/c37ca4ef-dcf6-4211-a2a4-128aa492cd07.yy
diff --git a/...s/dbee8ecd-e11f-4434-9572-340d23065804.yy → ...s/dbee8ecd-e11f-4434-9572-340d23065804.yy b/...s/dbee8ecd-e11f-4434-9572-340d23065804.yy → ...s/dbee8ecd-e11f-4434-9572-340d23065804.yy
diff --git a/...s/f392d7a3-6d80-44f2-8a0d-5f64da190896.yy → ...s/f392d7a3-6d80-44f2-8a0d-5f64da190896.yy b/...s/f392d7a3-6d80-44f2-8a0d-5f64da190896.yy → ...s/f392d7a3-6d80-44f2-8a0d-5f64da190896.yy
diff --git a/2.3/auto-framer.yymps → GMS 2.3/auto-framer.yymps b/2.3/auto-framer.yymps → GMS 2.3/auto-framer.yymps
diff --git a/2.3/auto-framer.yyp → GMS 2.3/auto-framer.yyp b/2.3/auto-framer.yyp → GMS 2.3/auto-framer.yyp
diff --git a/2.3/fonts/fnt_test/fnt_test.png → GMS 2.3/fonts/fnt_demo/fnt_demo.png b/2.3/fonts/fnt_test/fnt_test.png → GMS 2.3/fonts/fnt_demo/fnt_demo.png
diff --git a/2.3/fonts/fnt_test/fnt_test.yy → GMS 2.3/fonts/fnt_demo/fnt_demo.yy b/2.3/fonts/fnt_test/fnt_test.yy → GMS 2.3/fonts/fnt_demo/fnt_demo.yy
diff --git a/GMS 2.3/notes/info/info.txt b/GMS 2.3/notes/info/info.txt
@@ -0,0 +1 @@
+Version: 1.1
diff --git a/GMS 2.3/notes/info/info.yy b/GMS 2.3/notes/info/info.yy
diff --git a/GMS 2.3/objects/obj_demo/Alarm_0.gml b/GMS 2.3/objects/obj_demo/Alarm_0.gml
@@ -0,0 +1,3 @@
+var _d = new Vector2(window_get_width(), window_get_height());
+
+auto_frame(_d);
diff --git a/GMS 2.3/objects/obj_demo/Create_0.gml b/GMS 2.3/objects/obj_demo/Create_0.gml
@@ -0,0 +1,20 @@
+if (track_window_resize) prev_win_size = new Vector2(window_get_width(), window_get_height());
+
+fixed_display_size = !(os_type == os_ios || os_type == os_android);
+var _d = new Vector2(0, 0);
+
+if (fixed_display_size) {
+	_d.y = fixedDisplay_height;
+	_d.x = fixedDisplay_width;
+	window_set_rectangle(abs(display_get_width() - _d.x) / 2, abs(display_get_height() - _d.y) / 2, _d.x, _d.y);
+}
+
+else {
+	_d.y = display_get_height();
+	_d.x = display_get_width();
+	window_set_size(_d.x, _d.y);
+}
+
+auto_frame(_d);
+
+window_size = new Vector2(_d.x, _d.y);
diff --git a/2.3/objects/obj_screen/Draw_0.gml → GMS 2.3/objects/obj_demo/Draw_0.gml b/2.3/objects/obj_screen/Draw_0.gml → GMS 2.3/objects/obj_demo/Draw_0.gml
diff --git a/2.3/objects/obj_screen/Draw_64.gml → GMS 2.3/objects/obj_demo/Draw_64.gml b/2.3/objects/obj_screen/Draw_64.gml → GMS 2.3/objects/obj_demo/Draw_64.gml
@@ -4,7 +4,7 @@ if (draw_stats) {
 	draw_set_halign(fa_left);
 
 	draw_text(0, 0, "Display: " + string(display_get_width()) + " x " + string(display_get_height()) + "\n" +
-		"Window: " + string(window_size.w) + " x " + string(window_size.h) + "\n" + 
+		"Window: " + string(window_size.x) + " x " + string(window_size.y) + "\n" + 
 		"Viewport: " + string(view_get_wport(0)) + " x " + string(view_get_hport(0))  + "\n" +
 		"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" +
 		"Application Surface: " + string(surface_get_width(application_surface)) + " x " + string(surface_get_height(application_surface))  + "\n" +

diff --git a/GMS 2.3/objects/obj_demo/Step_1.gml b/GMS 2.3/objects/obj_demo/Step_1.gml
@@ -0,0 +1,10 @@
+if (track_window_resize) {
+	var _cur_win_size = new Vector2(window_get_width(), window_get_height());
+
+	if (_cur_win_size.x != prev_win_size.x || _cur_win_size.y != prev_win_size.y) {
+		alarm[0] = 5;
+	}
+
+	prev_win_size.x = _cur_win_size.x;
+	prev_win_size.y = _cur_win_size.y;
+}
diff --git a/2.3/objects/obj_screen/obj_screen.yy → GMS 2.3/objects/obj_demo/obj_demo.yy b/2.3/objects/obj_screen/obj_screen.yy → GMS 2.3/objects/obj_demo/obj_demo.yy
diff --git a/2.3/options/amazonfire/options_amazonfire.yy → .../options/amazonfire/options_amazonfire.yy b/2.3/options/amazonfire/options_amazonfire.yy → .../options/amazonfire/options_amazonfire.yy
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		var _d = new Vector2(window_get_width(), window_get_height());

		auto_frame(_d);