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

YoYoGames · Aug 2, 2024 · 9de84ac · 9de84ac
2 parents a4399f2 + 371d345
commit 9de84ac
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/...r_Language/GML_Reference/Asset_Management/Sequences/Sequence_Structs/The_Track_Struct.htm b/...r_Language/GML_Reference/Asset_Management/Sequences/Sequence_Structs/The_Track_Struct.htm
@@ -164,7 +164,7 @@ <h2 id="type">Type</h2>
       </tr>
       <tr>
         <td><span class="inline">seqtracktype_audioeffect</span></td>
-        <td>This is an audio effect track.</td>
+        <td>This is an audio effect parameter track.</td>
         <td>19</td>
       </tr>
     </tbody>

diff --git a/Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Sequences/Sequences.htm b/Manual/contents/GameMaker_Language/GML_Reference/Asset_Management/Sequences/Sequences.htm
@@ -61,8 +61,7 @@ <h1>Séquences</h1>
   <p class="code">// Create a new keyframe struct for a graphics asset track and add it to an array (as you can have multiple keys in a frame)<br />
     var graphickeys = array_create(1);<br />
     graphickeys[0] = sequence_keyframe_new(seqtracktype_graphic);<br />
-    <br />
-    // Set the graphics keyframe top level data for the keyframe position and length, etc...<br />
+    // Set the graphics keyframe top level data for the keyframe position and length, etc.<br />
     graphickeys[0].frame = 0;<br />
     graphickeys[0].length = 1;<br />
     graphickeys[0].stretch = true;<br />

diff --git a/...l/contents/GameMaker_Language/GML_Reference/Drawing/GPU_Control/gpu_set_texrepeat_ext.htm b/...l/contents/GameMaker_Language/GML_Reference/Drawing/GPU_Control/gpu_set_texrepeat_ext.htm
@@ -42,13 +42,13 @@ <h4>Les retours :</h4>
   <p> </p>
   <h4>Exemple :</h4>
   <p class="code">var s_tex = shader_get_sampler_index(shader_glass, &quot;s_NoiseSampler&quot;);<br />
-    if (gpu_get_texfilter_ext(s_tex))<br />
+    if (gpu_get_texrepeat_ext(s_tex))<br />
     {<br />
-        gpu_set_texfilter_ext(s_tex, false);<br />
+        gpu_set_texrepeat_ext(s_tex, false);<br />
     }<br />
     else<br />
     {<br />
-        gpu_set_texfilter_ext(s_tex, true);<br />
+        gpu_set_texrepeat_ext(s_tex, true);<br />
     }</p>
   <p>Le code ci-dessus vérifie si le filtrage de texture est activé ou non pour un ID d'échantillonneur spécifique (stocké dans une variable locale) et l'active en conséquence.</p>
   <p> </p>

diff --git a/...nts/GameMaker_Language/GML_Reference/Game_Input/GamePad_Input/gamepad_get_description.htm b/...nts/GameMaker_Language/GML_Reference/Game_Input/GamePad_Input/gamepad_get_description.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>gamepad_get_description</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" />
@@ -25,7 +25,7 @@ <h4>Syntaxe :</h4>
       <tr>
         <th>Arguments</th><th>Type</th>
         <th>Description</th>
-     </tr>
+      </tr>
       <tr>
         <td><span class="notranslate">device</span></td><td><span data-keyref="Type_Real"></span></td>
         <td><span class="notranslate">Which gamepad &quot;slot&quot; to get the name of.</span></td>
@@ -40,13 +40,14 @@ <h4>Exemple :</h4>
   <p class="code">var gp_num = gamepad_get_device_count();<br />
     for (var i = 0; i &lt; gp_num; i++;)<br />
     {<br />
-        if (gamepad_is_connected(i)) <br />
+        var _gamepad = gamepads[i];<br />
+        if (gamepad_is_connected(_gamepad))<br />
         {<br />
-            draw_text(32, 32 + (i * 32), gamepad_get_description(i));<br />
+            draw_text(32, 32 + (i * 32), gamepad_get_description(_gamepad));<br />
         }<br />
         else<br />
         {<br />
-            draw_text(32, 32 + (i * 32), &quot;No Gamepad Connected&quot;);<br />
+            draw_text(32, 32 + (i * 32), &quot;Gamepad not found&quot;);<br />
         }<br />
     }</p>
   <p>Le code ci-dessus parcourt en boucle tous les emplacements de manettes de jeu pour vérifier si des périphériques sont connectés, puis affiche du texte à l'écran selon qu'une manette de jeu est connectée ou non à l'emplacement.</p>

diff --git a/...ts/GameMaker_Language/GML_Reference/Game_Input/GamePad_Input/gamepad_get_device_count.htm b/...ts/GameMaker_Language/GML_Reference/Game_Input/GamePad_Input/gamepad_get_device_count.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>gamepad_get_device_count</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" />
@@ -29,7 +29,7 @@ <h4>Exemple :</h4>
   <p class="code">var gp_num = gamepad_get_device_count();<br />
     for (var i = 0; i &lt; gp_num; i++;)<br />
     {<br />
-        if (gamepad_is_connected(i)) <br />
+        if (gamepad_is_connected(i))<br />
         {<br />
             global.gp[i] = true;<br />
         }<br />

diff --git a/...s/GameMaker_Language/GML_Reference/Game_Input/GamePad_Input/gamepad_set_axis_deadzone.htm b/...s/GameMaker_Language/GML_Reference/Game_Input/GamePad_Input/gamepad_set_axis_deadzone.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>gamepad_set_axis_deadzone</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" />
@@ -28,7 +28,7 @@ <h4>Syntaxe :</h4>
       <tr>
         <th>Arguments</th><th>Type</th>
         <th>Description</th>
-     </tr>
+      </tr>
       <tr>
         <td><span class="notranslate">device</span></td><td><span data-keyref="Type_Real"></span></td>
         <td><span class="notranslate">Which gamepad device &quot;slot&quot; to check.</span></td>