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

YoYoGames · Feb 16, 2024 · 3d2bed8 · 3d2bed8
2 parents 50fc8ae + 479255d
commit 3d2bed8
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/Manual/contents/Additional_Information/Whitespace_Characters.htm b/Manual/contents/Additional_Information/Whitespace_Characters.htm
@@ -3,7 +3,7 @@
 <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 2020" />
+  <meta name="generator" content="Adobe RoboHelp 2022" />
   <title>White-space Characters</title>
   <meta name="topic-status" content="Draft" />
   <link rel="stylesheet" type="text/css" href="../assets/css/default.css" />
@@ -15,7 +15,7 @@
 <body>
   <h1><span data-field="title" data-format="default">White-space Characters</span></h1>
   <p>The following table lists the character codes and escape sequences that <span data-keyref="GameMaker Name">GameMaker</span> considers to be white-space characters. An empty cell in the table indicates there is no escape sequence for that character code.</p>
-  <p>For a detailed list of all these characters, see <a href="https://en.wikipedia.org/wiki/Whitespace_character#Unicode">Whitespace_character</a>.</p>
+  <p>For a detailed list of all these characters, see <a href="https://en.wikipedia.org/wiki/Whitespace_character#Unicode">Whitespace character</a>.</p>
   <table border="1" cellpadding="1" cellspacing="1" id="table" style="caption-side: top">
     <caption>Whitespace Characters</caption>
     <colgroup>
@@ -66,7 +66,7 @@ <h1><span data-field="title" data-format="default">White-space Characters</span>
       </tr>
       <tr>
         <td> </td>
-        <td>&quot;\u000A&quot;</td>
+        <td>&quot;\<span>u00A0</span>&quot;</td>
         <td>no-break space</td>
       </tr>
       <tr>
@@ -195,7 +195,7 @@ <h1><span data-field="title" data-format="default">White-space Characters</span>
         <div>Next: <a data-xref="{title}" href="Vectors.htm">Vectors</a></div>
       </div>
     </div>
-    <h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2022 All Rights Reserved</span></h5>
+    <h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2023 All Rights Reserved</span></h5>
   </div>
 </body>
 </html>
diff --git a/.../contents/GameMaker_Language/GML_Reference/Asset_Management/Instances/instance_change.htm b/.../contents/GameMaker_Language/GML_Reference/Asset_Management/Instances/instance_change.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>instance_change</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/.../contents/GameMaker_Language/GML_Reference/Asset_Management/Instances/instance_number.htm b/.../contents/GameMaker_Language/GML_Reference/Asset_Management/Instances/instance_number.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>instance_number</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/Manual/contents/GameMaker_Language/GML_Reference/Data_Structures/DS_Grids/ds_grid_copy.htm b/Manual/contents/GameMaker_Language/GML_Reference/Data_Structures/DS_Grids/ds_grid_copy.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>ds_grid_copy</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/Manual/contents/assets/snippets/GML_Not_real_array.hts b/Manual/contents/assets/snippets/GML_Not_real_array.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>GML_Not_real_array</title>
+  <link rel="stylesheet" type="text/css" href="../css/default.css" />
+</head>
+<body>
+  <p class="note"><span data-conref="Tag_note.hts"> </span> This variable does not hold a real GML array, so you cannot run any <a href="../../GameMaker_Language/GML_Reference/Variable_Functions/Array_Functions.htm">array functions</a> on it or serialise it (convert it to a string). The only operation you can run on it is returning a value at an index, with the <span class="inline2"><span data-field="title" data-format="default">GML_Not_real_array</span>[index]</span> syntax.</p>
+</body>
+</html>
diff --git a/Manual/toc/Default.toc b/Manual/toc/Default.toc
@@ -247,6 +247,7 @@
   <page href="../contents/Additional_Information/Best_Practices_When_Programming.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/Whitespace_Characters.htm" format="html" processing-role="normal"></page>
   <page href="../contents/Additional_Information/Vectors.htm" format="html" processing-role="normal"></page>
   <page navtitle="버퍼 사용 안내" href="../contents/Additional_Information/Guide_To_Using_Buffers.htm" format="html" processing-role="normal"></page>
   <page href="../contents/Additional_Information/Guide_To_Using_Particles.htm" format="html" processing-role="normal"></page>