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

YoYoGames · Nov 22, 2024 · 9ee89cb · 9ee89cb
2 parents 24186eb + a1251a9
commit 9ee89cb
Show file tree

Hide file tree

Showing 25 changed files with 1,572 additions and 1,458 deletions.
diff --git a/Manual/contents/GameMaker_Language/GML_Overview/Instance Keywords/other.htm b/Manual/contents/GameMaker_Language/GML_Overview/Instance Keywords/other.htm
@@ -49,6 +49,13 @@ <h2 id="h">When &#39;other&#39; changes</h2>
     <li>When calling an unbound constructor function, <span class="inline2">other</span> will be the instance or struct that called that function. If the constructor is bound as a method, then <span class="inline2">other</span> will be the instance or struct to which the constructor method is bound.</li>
     <li>When stored as a reference through a struct literal, covered below under &quot;<strong>&#39;other&#39; as a reference</strong>&quot;.</li>
   </ul>
+  <h3 id="legacy_other_behaviour">Legacy other Behaviour</h3>
+  <p>In previous versions of <span data-keyref="GameMaker Name">GameMaker</span> <span class="inline2">other</span> only changed in the following cases: </p>
+  <ul class="colour">
+    <li>As part of the <span class="inline2">with</span> statement.</li>
+    <li>When <span class="inline2">new</span> is called when a constructor is executed <span class="inline2">other</span> is set to the <span class="inline2">self</span> at the point that <span class="inline2">new</span> was called.</li>
+  </ul>
+  <p>This behaviour can be enabled by the <a href="../../../Settings/Game_Options.htm#legacy_other_behaviour">Legacy Other Behaviour</a> game option.</p>
   <h2>Struct Declaration</h2>
   <p>Scope doesn&#39;t change inside a struct declaration, so <span class="inline2">other</span> refers to the same scope as <span class="inline2">self</span> (the <strong>current</strong> scope), meaning the struct or instance that&#39;s initialising the struct:</p>
   <p class="code">var _struct =<br />

diff --git a/.../GameMaker_Language/GML_Reference/Asset_Management/Instances/Instance_Variables/alarm.htm b/.../GameMaker_Language/GML_Reference/Asset_Management/Instances/Instance_Variables/alarm.htm
@@ -30,7 +30,7 @@ <h4>リターンです。</h4>
   <h4>例</h4>
   <p class="code">if canshoot<br />
     {<br />
-        if (keyboard_check_pressed(vk_space)) <br />
+        if (keyboard_check_pressed(vk_space))<br />
         {<br />
             canshoot = false;<br />
             alarm[0] = room_speed;<br />

diff --git a/...nts/GameMaker_Language/GML_Reference/Asset_Management/Instances/instance_create_layer.htm b/...nts/GameMaker_Language/GML_Reference/Asset_Management/Instances/instance_create_layer.htm
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -94,13 +94,14 @@ <h4>例2．</h4>
         <div style="float:left">戻る：<a href="Instances.htm">インスタンス</a></div>
         <div style="float:right">次のページ <a href="instance_create_depth.htm"><span class="notranslate">instance_create_depth</span></a></div>
       </div>
-      <h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2024 All Rights Reserved</span></h5>
     </div>
     <h5><span data-keyref="Copyright Notice">© Copyright<span class="notranslate">YoYo Games Ltd.</span> 2022 All Rights Reserved</span></h5>
   </div>
   <!-- KEYWORDS
 instance_create_layer
---><!-- TAGS
+-->
+  <!-- TAGS
 instance_create_layer
---></body>
+-->
+</body>
 </html>
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/...uage/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_bottom.htm b/...uage/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_bottom.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>sprite_get_bbox_bottom</title>
-  <meta name="generator" content="Adobe RoboHelp 2019" />
+  <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="Mark Alexander" />

diff --git a/...nguage/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_left.htm b/...nguage/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_left.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>sprite_get_bbox_left</title>
-  <meta name="generator" content="Adobe RoboHelp 2019" />
+  <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="Mark Alexander" />

diff --git a/...nguage/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_mode.htm b/...nguage/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_mode.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>sprite_get_bbox_mode</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="Mark Alexander" />

diff --git a/...guage/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_right.htm b/...guage/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_right.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>sprite_get_bbox_right</title>
-  <meta name="generator" content="Adobe RoboHelp 2019" />
+  <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="Mark Alexander" />

diff --git a/...anguage/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_top.htm b/...anguage/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_top.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>sprite_get_bbox_top</title>
-  <meta name="generator" content="Adobe RoboHelp 2019" />
+  <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="Mark Alexander" />

diff --git a/...aker_Language/GML_Reference/Cameras_And_Display/The_Game_Window/window_get_fullscreen.htm b/...aker_Language/GML_Reference/Cameras_And_Display/The_Game_Window/window_get_fullscreen.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>window_get_fullscreen</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="Mark Alexander" />