Merge remote-tracking branch 'upstream/develop' into develop

YoYoGames · Dec 14, 2023 · eb1050d · eb1050d
2 parents 70ff3ba + 78ca8c5
commit eb1050d
Show file tree

Hide file tree

Showing 43 changed files with 152 additions and 127 deletions.
diff --git a/Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Rooms/room_get_info.htm b/Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Rooms/room_get_info.htm
diff --git a/...splay/The_Game_WIndow/The_Game_Window.htm → ...splay/The_Game_Window/The_Game_Window.htm b/...splay/The_Game_WIndow/The_Game_Window.htm → ...splay/The_Game_Window/The_Game_Window.htm
diff --git a/...Display/The_Game_WIndow/window_center.htm → ...Display/The_Game_Window/window_center.htm b/...Display/The_Game_WIndow/window_center.htm → ...Display/The_Game_Window/window_center.htm
diff --git a/...Display/The_Game_WIndow/window_device.htm → ...Display/The_Game_Window/window_device.htm b/...Display/The_Game_WIndow/window_device.htm → ...Display/The_Game_Window/window_device.htm
diff --git a/...ay/The_Game_WIndow/window_get_caption.htm → ...ay/The_Game_Window/window_get_caption.htm b/...ay/The_Game_WIndow/window_get_caption.htm → ...ay/The_Game_Window/window_get_caption.htm
diff --git a/...lay/The_Game_WIndow/window_get_colour.htm → ...lay/The_Game_Window/window_get_colour.htm b/...lay/The_Game_WIndow/window_get_colour.htm → ...lay/The_Game_Window/window_get_colour.htm
diff --git a/...lay/The_Game_WIndow/window_get_cursor.htm → ...lay/The_Game_Window/window_get_cursor.htm b/...lay/The_Game_WIndow/window_get_cursor.htm → ...lay/The_Game_Window/window_get_cursor.htm
diff --git a/...The_Game_WIndow/window_get_fullscreen.htm → ...The_Game_Window/window_get_fullscreen.htm b/...The_Game_WIndow/window_get_fullscreen.htm → ...The_Game_Window/window_get_fullscreen.htm
diff --git a/...lay/The_Game_WIndow/window_get_height.htm → ...lay/The_Game_Window/window_get_height.htm b/...lay/The_Game_WIndow/window_get_height.htm → ...lay/The_Game_Window/window_get_height.htm
diff --git a/...The_Game_WIndow/window_get_showborder.htm → ...The_Game_Window/window_get_showborder.htm b/...The_Game_WIndow/window_get_showborder.htm → ...The_Game_Window/window_get_showborder.htm
diff --git a/..._Game_WIndow/window_get_visible_rects.htm → ..._Game_Window/window_get_visible_rects.htm b/..._Game_WIndow/window_get_visible_rects.htm → ..._Game_Window/window_get_visible_rects.htm
diff --git a/...play/The_Game_WIndow/window_get_width.htm → ...play/The_Game_Window/window_get_width.htm b/...play/The_Game_WIndow/window_get_width.htm → ...play/The_Game_Window/window_get_width.htm
diff --git a/..._Display/The_Game_WIndow/window_get_x.htm → ..._Display/The_Game_Window/window_get_x.htm b/..._Display/The_Game_WIndow/window_get_x.htm → ..._Display/The_Game_Window/window_get_x.htm
diff --git a/..._Display/The_Game_WIndow/window_get_y.htm → ..._Display/The_Game_Window/window_get_y.htm b/..._Display/The_Game_WIndow/window_get_y.htm → ..._Display/The_Game_Window/window_get_y.htm
diff --git a/...Display/The_Game_WIndow/window_handle.htm → ...Display/The_Game_Window/window_handle.htm b/...Display/The_Game_WIndow/window_handle.htm → ...Display/The_Game_Window/window_handle.htm
diff --git a/...play/The_Game_WIndow/window_has_focus.htm → ...play/The_Game_Window/window_has_focus.htm b/...play/The_Game_WIndow/window_has_focus.htm → ...play/The_Game_Window/window_has_focus.htm
diff --git a/..._Game_WIndow/window_mouse_get_delta_x.htm → ..._Game_Window/window_mouse_get_delta_x.htm b/..._Game_WIndow/window_mouse_get_delta_x.htm → ..._Game_Window/window_mouse_get_delta_x.htm
diff --git a/..._Game_WIndow/window_mouse_get_delta_y.htm → ..._Game_Window/window_mouse_get_delta_y.htm b/..._Game_WIndow/window_mouse_get_delta_y.htm → ..._Game_Window/window_mouse_get_delta_y.htm
diff --git a/...e_Game_WIndow/window_mouse_get_locked.htm → ...e_Game_Window/window_mouse_get_locked.htm b/...e_Game_WIndow/window_mouse_get_locked.htm → ...e_Game_Window/window_mouse_get_locked.htm
diff --git a/...ay/The_Game_WIndow/window_mouse_get_x.htm → ...ay/The_Game_Window/window_mouse_get_x.htm b/...ay/The_Game_WIndow/window_mouse_get_x.htm → ...ay/The_Game_Window/window_mouse_get_x.htm
diff --git a/...ay/The_Game_WIndow/window_mouse_get_y.htm → ...ay/The_Game_Window/window_mouse_get_y.htm b/...ay/The_Game_WIndow/window_mouse_get_y.htm → ...ay/The_Game_Window/window_mouse_get_y.htm
diff --git a/...play/The_Game_WIndow/window_mouse_set.htm → ...play/The_Game_Window/window_mouse_set.htm b/...play/The_Game_WIndow/window_mouse_set.htm → ...play/The_Game_Window/window_mouse_set.htm
diff --git a/...e_Game_WIndow/window_mouse_set_locked.htm → ...e_Game_Window/window_mouse_set_locked.htm b/...e_Game_WIndow/window_mouse_set_locked.htm → ...e_Game_Window/window_mouse_set_locked.htm
diff --git a/...ay/The_Game_WIndow/window_set_caption.htm → ...ay/The_Game_Window/window_set_caption.htm b/...ay/The_Game_WIndow/window_set_caption.htm → ...ay/The_Game_Window/window_set_caption.htm
diff --git a/...lay/The_Game_WIndow/window_set_colour.htm → ...lay/The_Game_Window/window_set_colour.htm b/...lay/The_Game_WIndow/window_set_colour.htm → ...lay/The_Game_Window/window_set_colour.htm
diff --git a/...lay/The_Game_WIndow/window_set_cursor.htm → ...lay/The_Game_Window/window_set_cursor.htm b/...lay/The_Game_WIndow/window_set_cursor.htm → ...lay/The_Game_Window/window_set_cursor.htm
diff --git a/...The_Game_WIndow/window_set_fullscreen.htm → ...The_Game_Window/window_set_fullscreen.htm b/...The_Game_WIndow/window_set_fullscreen.htm → ...The_Game_Window/window_set_fullscreen.htm
diff --git a/...The_Game_WIndow/window_set_max_height.htm → ...The_Game_Window/window_set_max_height.htm b/...The_Game_WIndow/window_set_max_height.htm → ...The_Game_Window/window_set_max_height.htm
diff --git a/.../The_Game_WIndow/window_set_max_width.htm → .../The_Game_Window/window_set_max_width.htm b/.../The_Game_WIndow/window_set_max_width.htm → .../The_Game_Window/window_set_max_width.htm
diff --git a/...The_Game_WIndow/window_set_min_height.htm → ...The_Game_Window/window_set_min_height.htm b/...The_Game_WIndow/window_set_min_height.htm → ...The_Game_Window/window_set_min_height.htm
diff --git a/.../The_Game_WIndow/window_set_min_width.htm → .../The_Game_Window/window_set_min_width.htm b/.../The_Game_WIndow/window_set_min_width.htm → .../The_Game_Window/window_set_min_width.htm
diff --git a/...y/The_Game_WIndow/window_set_position.htm → ...y/The_Game_Window/window_set_position.htm b/...y/The_Game_WIndow/window_set_position.htm → ...y/The_Game_Window/window_set_position.htm
diff --git a/.../The_Game_WIndow/window_set_rectangle.htm → .../The_Game_Window/window_set_rectangle.htm b/.../The_Game_WIndow/window_set_rectangle.htm → .../The_Game_Window/window_set_rectangle.htm
diff --git a/...The_Game_WIndow/window_set_showborder.htm → ...The_Game_Window/window_set_showborder.htm b/...The_Game_WIndow/window_set_showborder.htm → ...The_Game_Window/window_set_showborder.htm
diff --git a/...splay/The_Game_WIndow/window_set_size.htm → ...splay/The_Game_Window/window_set_size.htm b/...splay/The_Game_WIndow/window_set_size.htm → ...splay/The_Game_Window/window_set_size.htm
diff --git a/...e_Game_WIndow/window_view_mouse_get_x.htm → ...e_Game_Window/window_view_mouse_get_x.htm b/...e_Game_WIndow/window_view_mouse_get_x.htm → ...e_Game_Window/window_view_mouse_get_x.htm
diff --git a/...e_Game_WIndow/window_view_mouse_get_y.htm → ...e_Game_Window/window_view_mouse_get_y.htm b/...e_Game_WIndow/window_view_mouse_get_y.htm → ...e_Game_Window/window_view_mouse_get_y.htm
diff --git a/..._Game_WIndow/window_views_mouse_get_x.htm → ..._Game_Window/window_views_mouse_get_x.htm b/..._Game_WIndow/window_views_mouse_get_x.htm → ..._Game_Window/window_views_mouse_get_x.htm
diff --git a/..._Game_WIndow/window_views_mouse_get_y.htm → ..._Game_Window/window_views_mouse_get_y.htm b/..._Game_WIndow/window_views_mouse_get_y.htm → ..._Game_Window/window_views_mouse_get_y.htm
diff --git a/Manual/contents/Settings/Game_Settings.htm b/Manual/contents/Settings/Game_Settings.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>GameMaker Runner</title>
-  <meta name="generator" content="Adobe RoboHelp 2020" />
+  <meta name="generator" content="Adobe RoboHelp 2022" />
   <link rel="stylesheet" href="../assets/css/default.css" type="text/css" />
   <script src="../assets/scripts/main_script.js"></script>
   <meta name="rh-authors" content="Gurpreet S. Matharoo" />

diff --git a/Manual/contents/assets/snippets/Note_Warning_GM_FileSystem_Sandboxed.hts b/Manual/contents/assets/snippets/Note_Warning_GM_FileSystem_Sandboxed.hts
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <meta name="generator" content="Adobe RoboHelp 2022"/>
-  <meta name="topic-comment" content="A warning note to explain that GameMaker by default uses the file sandbox"/>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="generator" content="Adobe RoboHelp 2022" />
+  <meta name="topic-comment" content="A warning note to explain that GameMaker by default uses the file sandbox" />
   <title>Note_Warning_GM_FileSystem_Sandboxed</title>
-  <link rel="stylesheet" type="text/css" href="../css/default.css"/>
+  <link rel="stylesheet" type="text/css" href="../css/default.css" />
 </head>
 <body>
-  <p class="note"><b><span data-conref="Tag_warning.hts"> </span> </b>This function may not work as you expect due to <span data-keyref="GameMaker Name">GameMaker</span> being sandboxed! Please see the section on <a data-xref="{title}" href="../../Additional_Information/The_File_System.htm">The File System</a> for more information.</p>
-
-</body></html>
+  <p class="note"><b><span data-conref="Tag_warning.hts"> </span> </b>This may not work as you expect due to <span data-keyref="GameMaker Name">GameMaker</span> being sandboxed! Please see the section on <a data-xref="{title}" href="../../Additional_Information/The_File_System.htm">The File System</a> for more information.</p>
+</body>
+</html>
diff --git a/Manual/contents/assets/snippets/Warning_directory_os_permissions.hts b/Manual/contents/assets/snippets/Warning_directory_os_permissions.hts
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="generator" content="Adobe RoboHelp 2022" />
+  <meta name="topic-comment" content="" />
+  <title>Warning_directory_os_permissions</title>
+  <link rel="stylesheet" type="text/css" href="../css/default.css" />
+</head>
+<body>
+  <p class="note"><span data-conref="Tag_warning.hts"> </span> <span data-keyref="GameMaker Name">GameMaker</span> doesn&#39;t limit writing to this directory so whether this is possible depends on OS permissions. It is however discouraged that you write to <span class="inline2"><span data-field="title" data-format="default">Warning_directory_os_permissions</span></span>, as it is possible to damage the game installation this way.</p>
+</body>
+</html>
diff --git a/Manual/toc/Default.toc b/Manual/toc/Default.toc
@@ -151,6 +151,7 @@
   </book>
   <page href="../contents/Settings/The_Room_Manager.htm" format="html" processing-role="normal"></page>
   <page href="../contents/Settings/Included_Files.htm" format="html" processing-role="normal"></page>
+  <page href="../contents/Additional_Information/The_File_System.htm" format="html" processing-role="normal"></page>
   <page href="../contents/Settings/Audio_Groups.htm" format="html" processing-role="normal"></page>
   <book href="../contents/Settings/Texture_Groups.htm" format="html" processing-role="normal">
     <page href="../contents/Settings/Texture_Information/Texture_Pages.htm" format="html" processing-role="normal"></page>
@@ -243,7 +244,6 @@
 </book>
 <book navtitle="追加情報" href="../contents/Additional_Information/Additional_Information.htm" format="html" processing-role="normal">
   <page href="../contents/Additional_Information/Best_Practices_When_Programming.htm" format="html" processing-role="normal"></page>
-  <page href="../contents/Additional_Information/The_File_System.htm" format="html" processing-role="normal"></page>
   <page href="../contents/Additional_Information/Bitwise_Operators.htm" format="html" processing-role="normal"></page>
   <page href="../contents/Additional_Information/Type_Tables.htm" format="html" processing-role="normal"></page>
   <page href="../contents/Additional_Information/Vectors.htm" format="html" processing-role="normal"></page>