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

YoYoGames · Dec 6, 2024 · 7befec1 · 7befec1
2 parents 8a783c6 + e1a644b
commit 7befec1
Show file tree

Hide file tree

Showing 82 changed files with 942 additions and 63 deletions.
diff --git a/...ontents/GameMaker_Language/GML_Overview/Variables/Builtin_Global_Variables/async_load.htm b/...ontents/GameMaker_Language/GML_Overview/Variables/Builtin_Global_Variables/async_load.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>async_load</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/Audio/audio_play_sound_ext.htm b/...contents/GameMaker_Language/GML_Reference/Asset_Management/Audio/audio_play_sound_ext.htm
@@ -62,7 +62,7 @@ <h4>Syntax:</h4>
   </table>
   <p> </p>
   <h4>Returns:</h4>
-  <p class="code"><span data-keyref="Type_ID_Sound_Instance"><a href="audio_play_sound.htm" target="_blank">Sound Instance ID</a></span></p>
+  <p class="code"><span data-keyref="Type_ID_Sound_Instance"><a href="audio_play_sound.htm" target="_blank">Sound Instance ID</a></span> (or -1 if the sound could not be played)</p>
   <p> </p>
   <h4>Example 1: Playing a basic sound (similar to audio_play_sound)</h4>
   <p class="code"><span data-field="title" data-format="default">audio_play_sound_ext</span>({ sound: snd_ambience });</p>
@@ -105,7 +105,7 @@ <h4>Example 3: Playing a sound at a given position in 3D audio space (similar to
         <div>Next: <a data-xref="{title}" href="audio_play_sound_at.htm">audio_play_sound_at</a></div>
       </div>
     </div>
-    <h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2023 All Rights Reserved</span></h5>
+    <h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2024 All Rights Reserved</span></h5>
   </div>
   <!-- KEYWORDS
 audio_play_sound_ext

diff --git a/...contents/GameMaker_Language/GML_Reference/Asset_Management/Audio/audio_throw_on_error.htm b/...contents/GameMaker_Language/GML_Reference/Asset_Management/Audio/audio_throw_on_error.htm
@@ -18,8 +18,6 @@ <h1><span data-field="title" data-format="default">audio_throw_on_error</span></
   <p>This function enables or disables audio functions throwing fatal errors (as described in <a data-xref="{text}" href="Audio.htm#h1">Audio Error Handling</a>). By default, throwing is enabled and you can pass <span class="inline2">false</span> to this function to disable that behaviour and instead make such errors print a message to the Output Log.</p>
   <div data-conref="../../../../assets/snippets/HTML5_Not_Available.hts"> </div>
   <p> </p>
-  <ul class="colour">
-  </ul>
   <h4>Syntax:</h4>
   <p class="code"><span data-field="title" data-format="default">audio_throw_on_error</span>(enable);</p>
   <table>

diff --git a/Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Shaders/Shaders.htm b/Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Shaders/Shaders.htm
@@ -30,9 +30,9 @@ <h1>Шейдеры</h1>
     colour_to_set = shader_get_uniform(sShaderDemo5, &quot;f_Colour2&quot;);</p>
   <p>Когда у вас есть равномерные ручки, их можно установить в коде шейдера для <b>события Draw Event</b> следующим образом:</p>
   <p class="code">shader_set(sShaderDemo5);<br />
-    shader_set_uniform_f(colour_to_find, 1,1,1 );<br />
-    shader_set_uniform_f(colour_to_set, 1,0,0 );<br />
-    draw_sprite(sprite_index,image_index,x+24, y);<br />
+    shader_set_uniform_f(colour_to_find, 1, 1, 1);<br />
+    shader_set_uniform_f(colour_to_set, 1, 0, 0);<br />
+    draw_sprite(sprite_index, image_index, x + 24, y);<br />
     shader_reset();</p>
   <p>И последнее, что следует отметить: хотя шейдеры принимаются на всех платформах, они все же зависят от устройства, и если аппаратное или программное обеспечение устройства не может использовать шейдеры, то вы получите ошибку. Поэтому рекомендуется проверить, что шейдер скомпилирован, прежде чем устанавливать форму или использовать сам шейдер, например, так:</p>
   <p class="code">if (shader_is_compiled(myShader))<br />

diff --git a/...Language/GML_Reference/Cameras_And_Display/Cameras_And_Viewports/camera_set_view_size.htm b/...Language/GML_Reference/Cameras_And_Display/Cameras_And_Viewports/camera_set_view_size.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>camera_set_view_size</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/Manual/contents/GameMaker_Language/GML_Reference/Drawing/Videos/video_get_status.htm b/Manual/contents/GameMaker_Language/GML_Reference/Drawing/Videos/video_get_status.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>video_get_status</title>
   <meta name="topic-status" content="Draft" />
   <link rel="stylesheet" type="text/css" href="../../../../assets/css/default.css" />

diff --git a/Manual/contents/GameMaker_Language/GML_Reference/OS_And_Compiler/GM_build_type.htm b/Manual/contents/GameMaker_Language/GML_Reference/OS_And_Compiler/GM_build_type.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>GM_build_type</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="Bart Teunis" />
@@ -40,10 +40,10 @@ <h4>Пример:</h4>
     <h5><span data-keyref="Copyright Notice">© Copyright <span class="notranslate">YoYo Games Ltd.</span> 2022 Все права защищены</span></h5>
   </div>
   <!-- KEYWORDS
-gm_build_type
+GM_build_type
 -->
   <!-- TAGS
-gm_build_type
+GM_build_type
 -->
 </body>
 </html>
diff --git a/Manual/contents/IDE_Tools/Additional_IDE_Tools.htm b/Manual/contents/IDE_Tools/Additional_IDE_Tools.htm
@@ -8,9 +8,9 @@
   <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" />
-  <meta name="topic-comment" content="Section that covers the rest of the IDE tools that other sections don&#39;t cover" />
-  <meta name="rh-index-keywords" content="Additional IDE Tools" />
-  <meta name="search-keywords" content="IDE Tools,Additional Tools" />
+  <meta name="topic-comment" content="Section that covers IDE tools related to projects and assets" />
+  <meta name="rh-index-keywords" content="Project and Assets IDE Tools" />
+  <meta name="search-keywords" content="Project and Assets IDE Tools" />
 </head>
 <body>
   <!--<div class="body-scroll" style="top: 150px;">-->
@@ -40,7 +40,7 @@ <h5><span data-keyref="Copyright Notice">© Copyright <span class="notranslate">
 Additional <span class="notranslate">IDE</span> Tools
 -->
   <!-- TAGS
-ide_tools
+project_ide_tools
 -->
 </body>
 </html>
diff --git a/Manual/contents/IDE_Tools/Compiling_&_Runtime.htm b/Manual/contents/IDE_Tools/Compiling_&_Runtime.htm
@@ -0,0 +1,42 @@
+<?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" />
+  <title>Compiling &amp; Running</title>
+  <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" type="module"></script>
+  <meta name="rh-authors" content="Gurpreet S. Matharoo" />
+  <meta name="topic-comment" content="Section that covers IDE tools related to compiling and runtime" />
+  <meta name="rh-index-keywords" content="Compilation and Runtime IDE Tools" />
+  <meta name="search-keywords" content="Compilation and Runtime IDE Tools" />
+</head>
+<body>
+  <!--<div class="body-scroll" style="top: 150px;">-->
+  <h1><span data-field="title" data-format="default">Compiling &amp; Running</span></h1>
+  <p>This section covers the IDE tools that assist with compilation or are used by the runner during testing.</p>
+  <ul class="colour">
+    <li><a data-xref="{title}" href="../Setting_Up_And_Version_Information/The_Device_Manager.htm">The Device Manager</a></li>
+    <li><a data-xref="{title}" href="The_Debugger.htm">The Debugger</a></li>
+    <li><a data-xref="{title}" href="The_Micro_Web_Server.htm">The Micro Web Server</a></li>
+  </ul>
+  <p> </p>
+  <p> </p>
+  <div class="footer">
+    <div class="buttons">
+      <div class="clear">
+        <div style="float:left">Back: <a href="../The_IDE/The_IDE.htm">The IDE</a></div>
+        <div style="float:right">Next: <a data-xref="{title}" href="Additional_IDE_Tools.htm">Project &amp; Assets</a></div>
+      </div>
+    </div>
+    <h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2024 All Rights Reserved</span></h5>
+  </div>
+  <!-- KEYWORDS
+Compilation and Runtime IDE Tools
+-->
+  <!-- TAGS
+comp_run_ide_tools
+-->
+</body>
+</html>
diff --git a/Manual/contents/IDE_Tools/Package_Manager.htm b/Manual/contents/IDE_Tools/Package_Manager.htm
@@ -17,7 +17,7 @@
 <body>
   <h1><span data-field="title" data-format="default">Package Manager</span></h1>
   <p><img class="center" src="../assets/Images/IDE Tools/PackageManager_Main.png" /></p>
-  <p>The Package Manager lets you install packages that <span data-keyref="GameMaker Name">GameMaker</span> can use for the IDE and during your game&#39;s compilation. Currently you can use this to install latest versions of Localisation plugins and the <a data-xref="{title}" href="Project_Tool.htm">Project Tool</a>. <span data-condition="Export:Beta">This is also used for packages required for <a data-xref="{title}" href="../Settings/Runner_Details/GMRT_(GameMaker_Runtime).htm">GMRT (GameMaker Runtime)</a>.</span></p>
+  <p>The Package Manager lets you install packages that <span data-keyref="GameMaker Name">GameMaker</span> can use for the IDE and during your game&#39;s compilation. Currently you can use this to install latest versions of Localisation plugins and the <a data-xref="{title}" href="Project_Tool.htm">Project Tool</a>. <span data-condition="Export:Beta">This is also used for packages that are used for <a data-xref="{title}" href="../Settings/Runner_Details/GMRT_(GameMaker_Runtime).htm">GMRT (GameMaker Runtime)</a> and the <a data-xref="{title}" href="Prefab_Library.htm">Prefab Library</a>.</span></p>
   <p>The list on the left will show you all packages from the selected source, and clicking on a package will show its information on the right, where you can choose a version for the package and install it.</p>
   <p>In the top-left corner you can search for a package, and in the top-right corner you can change the source for the packages from a drop-down menu.</p>
   <h3>Package Sources</h3>
@@ -31,8 +31,8 @@ <h3>Package Sources</h3>
   <div class="footer">
     <div class="buttons">
       <div class="clear">
-        <div>Back: <a data-xref="{title}" href="Additional_IDE_Tools.htm">Additional IDE Tools</a></div>
-        <div>Next: <a data-xref="{title}" href="The_Debugger.htm">The Debugger</a></div>
+        <div>Back: <a data-xref="{title}" href="Additional_IDE_Tools.htm">Project &amp; Assets</a></div>
+        <div>Next: <a data-condition="Export:StableOnly" data-xref="{title}" href="Local_Asset_Packages.htm">Local Asset Packages</a> <a data-condition="Export:Beta" data-xref="{title}" href="Prefab_Library.htm">Prefab Library</a></div>
       </div>
     </div>
     <h5><span data-conref="../assets/snippets/Copyright_Notice_AutoUpdate.hts"> </span></h5>