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

YoYoGames · Aug 27, 2024 · 34a6d47 · 34a6d47
2 parents 623cc50 + fc49719
commit 34a6d47
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 3 deletions.
diff --git a/.../Flex_Panels/Function_Reference/Styling_Functions/flexpanel_node_style_set_flex_basis.htm b/.../Flex_Panels/Function_Reference/Styling_Functions/flexpanel_node_style_set_flex_basis.htm
@@ -19,7 +19,7 @@ <h1><span data-field="title" data-format="default">flexpanel_node_style_set_flex
   <p>See: <a data-rhwidget="HyperlinkPopover" data-xref="{text}" href="../../Flex_Panels_Styling.htm#h7">Flex Basis</a></p>
   <p> </p>
   <h4>Syntax:</h4>
-  <p class="code"><span data-field="title" data-format="default">flexpanel_node_style_set_flex_basis</span>(node, unit, value);</p>
+  <p class="code"><span data-field="title" data-format="default">flexpanel_node_style_set_flex_basis</span>(node, value, unit);</p>
   <table>
     <colgroup>
       <col />

diff --git a/...ce/Flex_Panels/Function_Reference/Styling_Functions/flexpanel_node_style_set_position.htm b/...ce/Flex_Panels/Function_Reference/Styling_Functions/flexpanel_node_style_set_position.htm
@@ -19,7 +19,7 @@ <h1><span data-field="title" data-format="default">flexpanel_node_style_set_posi
   <p>See: <a data-rhwidget="HyperlinkPopover" data-xref="{text}" href="../../Flex_Panels_Styling.htm#h12">Insets</a></p>
   <p> </p>
   <h4>Syntax:</h4>
-  <p class="code"><span data-field="title" data-format="default">flexpanel_node_style_set_position</span>(node, edge, unit, value);</p>
+  <p class="code"><span data-field="title" data-format="default">flexpanel_node_style_set_position</span>(node, edge, value, unit);</p>
   <table>
     <colgroup>
       <col />

diff --git a/Manual/contents/GameMaker_Language/GML_Reference/Physics/Fixtures/physics_fixture_create.htm b/Manual/contents/GameMaker_Language/GML_Reference/Physics/Fixtures/physics_fixture_create.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>physics_fixture_create</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/Note_keyboard_virtual_platforms.hts b/Manual/contents/assets/snippets/Note_keyboard_virtual_platforms.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>Note_keyboard_virtual_platforms</title>
+  <link rel="stylesheet" type="text/css" href="../css/default.css" />
+</head>
+<body>
+  <p class="note"><b><span class="note">NOTE</span> </b>This function is only valid for the <strong>Windows</strong>, <strong>Xbox (GDK)</strong>, <strong>Android</strong> (including <strong>AndroidTV</strong>), and <strong>iOS </strong>(including <strong>tvOS</strong>) target platforms.</p>
+</body>
+</html>
diff --git a/Manual/contents/assets/snippets/Note_physics_fixture_define.hts b/Manual/contents/assets/snippets/Note_physics_fixture_define.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>Note_physics_fixture_define</title>
+  <link rel="stylesheet" type="text/css" href="../css/default.css" />
+</head>
+<body>
+  <p class="note"><span data-conref="Tag_note.hts"> </span> You can only define a fixture within a room that has <a href="../../The_Asset_Editors/Room_Properties/Room_Properties.htm#physics">Physics</a> enabled.</p>
+</body>
+</html>
diff --git a/Manual/contents/assets/snippets/This_Saves_To_GameSaveID.hts b/Manual/contents/assets/snippets/This_Saves_To_GameSaveID.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_Saves_To_GameSaveID</title>
+  <link rel="stylesheet" type="text/css" href="../css/default.css" />
+</head>
+<body>
+  <p>This will save to the <span class="inline2"><a data-xref="{title}" href="../../GameMaker_Language/GML_Reference/General_Game_Control/game_save_id.htm">game_save_id</a></span> location when a relative path is specified.</p>
+</body>
+</html>