Skip to content

Commit 0c54deb

Browse files
author
github-actions
committed
Merge remote-tracking branch 'upstream/develop' into develop
2 parents 657de52 + a1251a9 commit 0c54deb

File tree

31 files changed

+1577
-1465
lines changed

31 files changed

+1577
-1465
lines changed

‎Manual/contents/GameMaker_Language/GML_Overview/Instance Keywords/other.htm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ <h2 id="h">When &#39;other&#39; changes</h2>
4949
<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>
5050
<li>When stored as a reference through a struct literal, covered below under &quot;<strong>&#39;other&#39; as a reference</strong>&quot;.</li>
5151
</ul>
52+
<h3 id="legacy_other_behaviour">Legacy other Behaviour</h3>
53+
<p>In previous versions of <span data-keyref="GameMaker Name">GameMaker</span> <span class="inline2">other</span> only changed in the following cases: </p>
54+
<ul class="colour">
55+
<li>As part of the <span class="inline2">with</span> statement.</li>
56+
<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>
57+
</ul>
58+
<p>This behaviour can be enabled by the <a href="../../../Settings/Game_Options.htm#legacy_other_behaviour">Legacy Other Behaviour</a> game option.</p>
5259
<h2>Struct Declaration</h2>
5360
<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>
5461
<p class="code">var _struct =<br />

‎Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Instances/Instance_Variables/alarm.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h4>Devuelve:</h4>
3030
<h4>Ejemplo:</h4>
3131
<p class="code">if canshoot<br />
3232
{<br />
33-
    if (keyboard_check_pressed(vk_space)) <br />
33+
    if (keyboard_check_pressed(vk_space))<br />
3434
    {<br />
3535
        canshoot = false;<br />
3636
        alarm[0] = room_speed;<br />

‎Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Instances/instance_create_layer.htm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<!DOCTYPE html>
33
<html xmlns="http://www.w3.org/1999/xhtml">
44
<head>
@@ -94,13 +94,14 @@ <h4>Ejemplo 2:</h4>
9494
<div style="float:left">Volver: <a href="Instances.htm">Instancias</a></div>
9595
<div style="float:right">Siguiente: <a href="instance_create_depth.htm"><span class="notranslate">instance_create_depth</span></a></div>
9696
</div>
97-
<h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2024 All Rights Reserved</span></h5>
9897
</div>
9998
<h5><span data-keyref="Copyright Notice">© Copyright <span class="notranslate">YoYo Games Ltd.</span> 2022 Todos los derechos reservados</span></h5>
10099
</div>
101100
<!-- KEYWORDS
102101
instance_create_layer
103-
--><!-- TAGS
102+
-->
103+
<!-- TAGS
104104
instance_create_layer
105-
--></body>
105+
-->
106+
</body>
106107
</html>

‎Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Rooms/room_get_info.htm

Lines changed: 842 additions & 867 deletions
Large diffs are not rendered by default.

‎Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_bottom.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66
<title>sprite_get_bbox_bottom</title>
7-
<meta name="generator" content="Adobe RoboHelp 2019" />
7+
<meta name="generator" content="Adobe RoboHelp 2022" />
88
<link rel="stylesheet" href="../../../../../assets/css/default.css" type="text/css" />
99
<script src="../../../../../assets/scripts/main_script.js"></script>
1010
<meta name="rh-authors" content="Mark Alexander" />

‎Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_left.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66
<title>sprite_get_bbox_left</title>
7-
<meta name="generator" content="Adobe RoboHelp 2019" />
7+
<meta name="generator" content="Adobe RoboHelp 2022" />
88
<link rel="stylesheet" href="../../../../../assets/css/default.css" type="text/css" />
99
<script src="../../../../../assets/scripts/main_script.js"></script>
1010
<meta name="rh-authors" content="Mark Alexander" />

‎Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_mode.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66
<title>sprite_get_bbox_mode</title>
7-
<meta name="generator" content="Adobe RoboHelp 2020" />
7+
<meta name="generator" content="Adobe RoboHelp 2022" />
88
<link rel="stylesheet" href="../../../../../assets/css/default.css" type="text/css" />
99
<script src="../../../../../assets/scripts/main_script.js"></script>
1010
<meta name="rh-authors" content="Mark Alexander" />

‎Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_right.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66
<title>sprite_get_bbox_right</title>
7-
<meta name="generator" content="Adobe RoboHelp 2019" />
7+
<meta name="generator" content="Adobe RoboHelp 2022" />
88
<link rel="stylesheet" href="../../../../../assets/css/default.css" type="text/css" />
99
<script src="../../../../../assets/scripts/main_script.js"></script>
1010
<meta name="rh-authors" content="Mark Alexander" />

‎Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Sprites/Sprite_Information/sprite_get_bbox_top.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66
<title>sprite_get_bbox_top</title>
7-
<meta name="generator" content="Adobe RoboHelp 2019" />
7+
<meta name="generator" content="Adobe RoboHelp 2022" />
88
<link rel="stylesheet" href="../../../../../assets/css/default.css" type="text/css" />
99
<script src="../../../../../assets/scripts/main_script.js"></script>
1010
<meta name="rh-authors" content="Mark Alexander" />

‎Manual/contents/GameMaker_Language/GML_Reference/Cameras_And_Display/Cameras_And_Viewports/camera_get_proj_mat.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66
<title>camera_get_proj_mat</title>
7-
<meta name="generator" content="Adobe RoboHelp 2020" />
7+
<meta name="generator" content="Adobe RoboHelp 2022" />
88
<link rel="stylesheet" href="../../../../assets/css/default.css" type="text/css" />
99
<script src="../../../../assets/scripts/main_script.js"></script>
1010
<meta name="rh-authors" content="Mark Alexander" />

‎Manual/contents/GameMaker_Language/GML_Reference/Cameras_And_Display/Cameras_And_Viewports/camera_get_view_mat.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66
<title>camera_get_view_mat</title>
7-
<meta name="generator" content="Adobe RoboHelp 2020" />
7+
<meta name="generator" content="Adobe RoboHelp 2022" />
88
<link rel="stylesheet" href="../../../../assets/css/default.css" type="text/css" />
99
<script src="../../../../assets/scripts/main_script.js"></script>
1010
<meta name="rh-authors" content="Mark Alexander" />

‎Manual/contents/GameMaker_Language/GML_Reference/Cameras_And_Display/The_Game_Window/window_get_fullscreen.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66
<title>window_get_fullscreen</title>
7-
<meta name="generator" content="Adobe RoboHelp 2020" />
7+
<meta name="generator" content="Adobe RoboHelp 2022" />
88
<link rel="stylesheet" href="../../../../assets/css/default.css" type="text/css" />
99
<script src="../../../../assets/scripts/main_script.js"></script>
1010
<meta name="rh-authors" content="Mark Alexander" />

‎Manual/contents/GameMaker_Language/GML_Reference/Cameras_And_Display/The_Game_Window/window_set_fullscreen.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
66
<title>window_set_fullscreen</title>
7-
<meta name="generator" content="Adobe RoboHelp 2020" />
7+
<meta name="generator" content="Adobe RoboHelp 2022" />
88
<link rel="stylesheet" href="../../../../assets/css/default.css" type="text/css" />
99
<script src="../../../../assets/scripts/main_script.js"></script>
1010
<meta name="rh-authors" content="Mark Alexander" />

0 commit comments

Comments
 (0)