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

YoYoGames · Dec 25, 2024 · 94b0b53 · 94b0b53
2 parents 69be321 + 296a54e
commit 94b0b53
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 18 deletions.
diff --git a/...ntents/GameMaker_Language/GML_Reference/Drawing/Sprites_And_Tiles/draw_sprite_general.htm b/...ntents/GameMaker_Language/GML_Reference/Drawing/Sprites_And_Tiles/draw_sprite_general.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>
@@ -114,13 +114,14 @@ <h4>Ejemplo:</h4>
         <div style="float:left">Atrás: <a href="Sprites_And_Tiles.htm">Sprites y baldosas</a></div>
         <div style="float:right">Siguiente: <a href="draw_sprite_part.htm"><span class="notranslate">draw_sprite_part</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> 2021 Todos los derechos reservados</span></h5>
   </div>
   <!-- KEYWORDS
 draw_sprite_general
---><!-- TAGS
+-->
+  <!-- TAGS
 draw_sprite_general
---></body>
+-->
+</body>
 </html>
diff --git a/...contents/GameMaker_Language/GML_Reference/Drawing/Sprites_And_Tiles/draw_sprite_tiled.htm b/...contents/GameMaker_Language/GML_Reference/Drawing/Sprites_And_Tiles/draw_sprite_tiled.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>
@@ -62,13 +62,14 @@ <h4>Ejemplo:</h4>
         <div style="float:left">Atrás: <a href="Sprites_And_Tiles.htm">Sprites y baldosas</a></div>
         <div style="float:right">Siguiente: <a href="draw_sprite_tiled_ext.htm"><span class="notranslate">draw_sprite_tiled_ext</span></a></div>
       </div>
-      <h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2021 All Rights Reserved</span></h5>
     </div>
     <h5><span data-keyref="Copyright Notice">© Copyright <span class="notranslate">YoYo Games Ltd.</span> 2021 Todos los derechos reservados</span></h5>
   </div>
   <!-- KEYWORDS
 draw_sprite_tiled
---><!-- TAGS
+-->
+  <!-- TAGS
 draw_sprite_tiled
---></body>
+-->
+</body>
 </html>
diff --git a/...ents/GameMaker_Language/GML_Reference/Drawing/Sprites_And_Tiles/draw_sprite_tiled_ext.htm b/...ents/GameMaker_Language/GML_Reference/Drawing/Sprites_And_Tiles/draw_sprite_tiled_ext.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>
@@ -81,13 +81,14 @@ <h4>Ejemplo:</h4>
         <div style="float:left">Atrás: <a href="Sprites_And_Tiles.htm">Sprites y baldosas</a></div>
         <div style="float:right">Siguiente: <a href="draw_enable_swf_aa.htm"><span class="notranslate">draw_enable_swf_aa</span></a></div>
       </div>
-      <h5><span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2021 All Rights Reserved</span></h5>
     </div>
     <h5><span data-keyref="Copyright Notice">© Copyright <span class="notranslate">YoYo Games Ltd.</span> 2021 Todos los derechos reservados</span></h5>
   </div>
   <!-- KEYWORDS
 draw_sprite_tiled_ext
---><!-- TAGS
+-->
+  <!-- TAGS
 draw_sprite_tiled_ext
---></body>
+-->
+</body>
 </html>
diff --git a/...contents/Setting_Up_And_Version_Information/IDE_Preferences/Text_Editor_2_Preferences.htm b/...contents/Setting_Up_And_Version_Information/IDE_Preferences/Text_Editor_2_Preferences.htm
@@ -14,8 +14,8 @@
 </head>
 <body>
   <!--<div class="body-scroll" style="top: 150px;">-->
-  <h1><span data-keyref="Code_Editor2_Name">Code Editor (Beta)</span> Preferences</h1>
-  <p><img class="center" src="../../assets/Images/Setup_And_Version/Preferences/CE_Prefs_Main.png" />This page describes all the preferences for <a data-xref="{title}" href="../../The_Asset_Editors/The_Text_Editor.htm">The Code Editor</a>, which contains the following sections:</p>
+  <h1><span data-keyref="Code_Editor2_Name">Code Editor</span> Preferences</h1>
+  <p><img class="center" src="../../assets/Images/Setup_And_Version/Preferences/CE_Prefs_Main.png" />This page describes all the preferences for <a data-xref="{title}" href="../../The_Asset_Editors/The_Text_Editor.htm">The Code Editor (Beta)</a>, which contains the following sections:</p>
   <div class="minitoc" data-minitoc-targetid="drop-down" data-type="minitoc" style="">
     <p class="minitoc-caption" data-close-text="" data-expanded="true" data-open-text="Contents" data-type="minitoc-caption" href="#" style="">Mini TOC (placeholder)</p>
     <ol class="minitoc-list" data-from-selector="h2" data-to-selector="h4" data-type="minitoc-list" style="">
@@ -25,8 +25,8 @@ <h1><span data-keyref="Code_Editor2_Name">Code Editor (Beta)</span> Preferences
   <h2>Main</h2>
   <p>The main section contains the following options:</p>
   <ul class="colour">
-    <li><strong>Enabled</strong>: Enable or disable the <span data-keyref="Code_Editor2_Name">Code Editor (Beta)</span>, disabling will make it fall back to the <span data-keyref="Code_Editor1_Name">Legacy Code Editor</span>. Changing this option will require you to restart the IDE. (Default: Disabled)</li>
-    <li><strong>Open Asset in Inspector when Editor is opened</strong>: When you open an asset in the <span data-keyref="Code_Editor2_Name">Code Editor (Beta)</span>, and this option is enabled, <a data-xref="{title}" href="../../IDE_Tools/The_Inspector.htm">The Inspector</a> will switch its focus to the newly opened asset so you can modify its properties. (Default: Enabled)</li>
+    <li><strong>Enabled</strong>: Enable or disable the <span data-keyref="Code_Editor2_Name">Code Editor</span>, disabling will make it fall back to the <span data-keyref="Code_Editor1_Name">Legacy Code Editor</span>. Changing this option will require you to restart the IDE. (Default: Disabled)</li>
+    <li><strong>Open Asset in Inspector when Editor is opened</strong>: When you open an asset in the <span data-keyref="Code_Editor2_Name">Code Editor</span>, and this option is enabled, <a data-xref="{title}" href="../../IDE_Tools/The_Inspector.htm">The Inspector</a> will switch its focus to the newly opened asset so you can modify its properties. (Default: Enabled)</li>
     <li><strong>Lock Documents when Debugger is active</strong>: When enabled, all documents in the project will become read-only while the Debugger is active. When disabled, you can edit those documents during Debugging.</li>
     <li><strong>Default Delete Document Choice</strong>: This controls what happens when you choose to delete a document. You can choose to show the dialog message, or automatically delete (<strong>Yes</strong>) or not delete (<strong>No</strong>) the document.</li>
   </ul>
@@ -79,15 +79,15 @@ <h3>Editing</h3>
     <li><strong>Auto-insert braces</strong>: Whether an ending brace should be auto-inserted when you write the beginning brace (e.g. <span class="inline2">{}</span>, <span class="inline2">()</span>).</li>
     <li><strong>Allow Overwrite Mode</strong>: When enabled, pressing <span class="shortcut">insert</span> will toggle between insertion mode and overwrite mode. When disabled, nothing will happen, and the editor will stay on insertion mode. (Default: Enabled)</li>
     <li><strong>Auto Indent Mode</strong>: See <a data-xref="{text}" href="../../The_Asset_Editors/Code_Editor_Properties/Editing_Text.htm#h1">Auto-Indent</a>.</li>
-    <li><strong>Auto Indent clipboard contents</strong>: Whether automatic indentation should be applied to pasted code.</li>
+    <li><strong>Auto Indent clipboard contents</strong>: Whether automatic indentation should be applied to pasted code. <span data-conref="../../assets/snippets/Tag_warning.hts"> </span> This feature is currently disabled and will not have any effect.</li>
     <li><strong>Allow selected text to be dragged and dropped</strong>: This controls whether you are able to drag and drop selected text in an editor from one place in the document to another.</li>
     <li><strong>Trim leading whitespace on backspace</strong>: When deleting whitespace at the start of a line using <span class="shortcut">backspace</span>, this controls whether the newline character before the whitespace is deleted as well, joining both lines together.</li>
     <li><strong>Insert separating whitespace when joining lines</strong>: This controls whether whitespace is inserted when pressing <span class="shortcut">Backspace</span> at the start of a line to join it with the line before.</li>
     <li><strong>Undo/Redo stack limit</strong>: Size of the undo/redo stack limit which controls how many undo commands you can perform. Any value below 0 is considered &quot;unlimited&quot;. (Default: 200)</li>
   </ul>
   <h2 id="h">Theme</h2>
   <p>The Theme section allows you to modify how documents are rendered in the editor.</p>
-  <p><img class="center" src="../../assets/Images/Setup_And_Version/Preferences/CE_Prefs_Theme.png" />The first option is the font used by the <span data-keyref="Code_Editor2_Name">Code Editor (Beta)</span>. Fonts that are fixed-width (which are recommended for coding over non-fixed-width fonts) are <strong>bolded</strong> in the drop-down list.</p>
+  <p><img class="center" src="../../assets/Images/Setup_And_Version/Preferences/CE_Prefs_Theme.png" />The first option is the font used by the <span data-keyref="Code_Editor2_Name">Code Editor</span>. Fonts that are fixed-width (which are recommended for coding over non-fixed-width fonts) are <strong>bolded</strong> in the drop-down list.</p>
   <p>You can also choose the size of the font, and whether to enable ligatures for fonts that use them.</p>
   <h3>Theme Selector</h3>
   <p>This contains a drop-drop menu for theme selection, with the default being &quot;<strong>GameMaker Dark - Default</strong>&quot;. You can edit any properties of the default theme.</p>

diff --git a/Manual/contents/assets/snippets/This_function_does_not_support_nine_slicing.hts b/Manual/contents/assets/snippets/This_function_does_not_support_nine_slicing.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>This_function_does_not_support_nine_slicing</title>
+  <link rel="stylesheet" type="text/css" href="../css/default.css" />
+</head>
+<body>
+  <p class="note"><span data-conref="Tag_note.hts"> </span> You cannot draw sprites that have <a data-xref="{title}" href="../../The_Asset_Editors/Sprite_Properties/Nine_Slices.htm">Nine Slice</a> enabled using this function.</p>
+</body>
+</html>