Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Feb 27, 2024
2 parents b1614d2 + 06c32fa commit c230368
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 44 deletions.
2 changes: 1 addition & 1 deletion ...s/GameMaker_Language/GML_Reference/Drawing/GPU_Control/gpu_set_blendmode_ext_sepalpha.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>gpu_set_blendmode_ext_sepalpha</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" />
Expand Down
2 changes: 1 addition & 1 deletion ...contents/GameMaker_Language/GML_Reference/File_Handling/Encoding_And_Hashing/load_csv.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h4>例</h4>
{<br />
    for (var j = 0; j &lt; hh; j++;)<br />
    {<br />
        draw_text(xx, yy, string(file_grid[# i, j]));<br />
        draw_text(xx, yy, file_grid[# i, j]);<br />
        yy += 32;<br />
    }<br />
    yy = 32;<br />
Expand Down
23 changes: 9 additions & 14 deletions Manual/contents/GameMaker_Language/GML_Reference/Variable_Functions/array_concat.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>array_concat</title>
<meta name="generator" content="Adobe RoboHelp 2020" />
<meta name="generator" content="Adobe RoboHelp 2022" />
<link rel="stylesheet" type="text/css" href="../../../assets/css/default.css" />
<script src="../../../assets/scripts/main_script.js" type="module"></script>
<meta name="rh-authors" content="" />
Expand All @@ -18,7 +18,7 @@ <h1><span data-field="title" data-format="default">array_concat</span></h1>
<p>This function takes multiple arrays as arguments, joins them together (in the order of the arguments), and returns the joined array.</p>
<p> </p>
<h4>Syntax:</h4>
<p class="code"><span data-field="title" data-format="default">array_concat</span>(array1, array2 [, array3, ... array_n]);</p>
<p class="code"><span data-field="title" data-format="default">array_concat</span>(array0, [array1, ... array_n]);</p>
<table>
<colgroup>
<col />
Expand All @@ -32,25 +32,20 @@ <h4>Syntax:</h4>
<th>Description</th>
</tr>
<tr>
<td>array1</td>
<td><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td>array0</td>
<td><span data-keyref="Type_Array"><a href="../../GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td>The first array to concatenate</td>
</tr>
<tr>
<td>array2</td>
<td><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td>The second array to concatenate</td>
</tr>
<tr>
<td>[array3, ... array_n]</td>
<td><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td><span data-conref="../../../assets/snippets/Tag_optional.hts"> </span> Additional arrays to concatenate</td>
<td>[array1, ... array_n]</td>
<td><span data-keyref="Type_Array"><a href="../../GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td><span data-conref="../../../assets/snippets/Tag_optional.hts"> </span> Any number of arrays to concatenate (one array per argument)</td>
</tr>
</tbody>
</table>
<p></p>
<p> </p>
<h4>Returns:</h4>
<p class="code"><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span> (new array with all arrays concatenated)</p>
<p class="code"><span data-keyref="Type_Array"><a href="../../GML_Overview/Arrays.htm" target="_blank">Array</a></span> (new array with all arrays concatenated)</p>
<p> </p>
<h4>Example:</h4>
<p class="code">array_1 = [1, 2, 3];<br />
Expand Down
23 changes: 9 additions & 14 deletions Manual/contents/GameMaker_Language/GML_Reference/Variable_Functions/array_intersection.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>array_intersection</title>
<meta name="generator" content="Adobe RoboHelp 2020" />
<meta name="generator" content="Adobe RoboHelp 2022" />
<link rel="stylesheet" type="text/css" href="../../../assets/css/default.css" />
<script src="../../../assets/scripts/main_script.js" type="module"></script>
<meta name="rh-authors" content="" />
Expand All @@ -19,7 +19,7 @@ <h1><span data-field="title" data-format="default">array_intersection</span></h1
<p>The function also removes any duplicates found in the intersection, so it only returns unique values.</p>
<div data-conref="../../../assets/snippets/function_order_not_ensured.hts"> </div>
<h4>Syntax:</h4>
<p class="code"><span data-field="title" data-format="default">array_intersection</span>(array1, array2 [, array3, ... array_n]);</p>
<p class="code"><span data-field="title" data-format="default">array_intersection</span>(array0, [array1, ... array_n]);</p>
<table>
<colgroup>
<col />
Expand All @@ -33,24 +33,19 @@ <h4>Syntax:</h4>
<th>Description</th>
</tr>
<tr>
<td>array1</td>
<td><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td>array0</td>
<td><span data-keyref="Type_Array"><a href="../../GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td>The first array</td>
</tr>
<tr>
<td>array2</td>
<td><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td>The second array</td>
</tr>
<tr>
<td>[array3, ... array_n]</td>
<td><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td><span data-conref="../../../assets/snippets/Tag_optional.hts"> </span> Additional arrays to include in the intersection</td>
<td>[array1, ... array_n]</td>
<td><span data-keyref="Type_Array"><a href="../../GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td><span data-conref="../../../assets/snippets/Tag_optional.hts"> </span> Any number of arrays for the intersection (one array per argument)</td>
</tr>
</tbody>
</table>
<h4>Returns:</h4>
<p class="code"><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span> (the intersection of the provided arrays)</p>
<p class="code"><span data-keyref="Type_Array"><a href="../../GML_Overview/Arrays.htm" target="_blank">Array</a></span> (the intersection of the provided arrays)</p>
<p> </p>
<h4>Example:</h4>
<p class="code">var _array1 = [1, 1, 2, 7, 12];<br />
Expand All @@ -70,7 +65,7 @@ <h4>Example:</h4>
<div>Next: <a data-xref="{title}" href="array_filter.htm">array_filter</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>
<!-- KEYWORDS
array_intersection
Expand Down
23 changes: 9 additions & 14 deletions Manual/contents/GameMaker_Language/GML_Reference/Variable_Functions/array_union.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>array_union</title>
<meta name="generator" content="Adobe RoboHelp 2020" />
<meta name="generator" content="Adobe RoboHelp 2022" />
<link rel="stylesheet" type="text/css" href="../../../assets/css/default.css" />
<script src="../../../assets/scripts/main_script.js" type="module"></script>
<meta name="rh-authors" content="" />
Expand All @@ -18,7 +18,7 @@ <h1><span data-field="title" data-format="default">array_union</span></h1>
<p><span>This function returns a <strong>new</strong> array that is the <a href="https://en.wikipedia.org/wiki/Union_(set_theory)">union</a> of all provided arrays. A union refers to all the </span>elements in the provided arrays, with duplicates removed.</p>
<div data-conref="../../../assets/snippets/function_order_not_ensured.hts"> </div>
<h4>Syntax:</h4>
<p class="code"><span data-field="title" data-format="default">array_union</span>(array1, array2 [, array3, ... array_n]);</p>
<p class="code"><span data-field="title" data-format="default">array_union</span>(array0, [array1, ... array_n]);</p>
<table>
<colgroup>
<col />
Expand All @@ -32,24 +32,19 @@ <h4>Syntax:</h4>
<th>Description</th>
</tr>
<tr>
<td>array1</td>
<td><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td>array0</td>
<td><span data-keyref="Type_Array"><a href="../../GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td>The first array</td>
</tr>
<tr>
<td>array2</td>
<td><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td>The second array</td>
</tr>
<tr>
<td>[array3, ..., array_n]</td>
<td><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td><span data-conref="../../../assets/snippets/Tag_optional.hts"> </span> Additional arrays</td>
<td>[array1, ... array_n]</td>
<td><span data-keyref="Type_Array"><a href="../../GML_Overview/Arrays.htm" target="_blank">Array</a></span></td>
<td><span data-conref="../../../assets/snippets/Tag_optional.hts"> </span> Any number of arrays for union (one array per argument)</td>
</tr>
</tbody>
</table>
<h4>Returns:</h4>
<p class="code"><span data-keyref="Type_Array"><a href="../../../../GameMaker_Language/GML_Overview/Arrays.htm" target="_blank">Array</a></span> (the union of the provided arrays)</p>
<p class="code"><span data-keyref="Type_Array"><a href="../../GML_Overview/Arrays.htm" target="_blank">Array</a></span> (the union of the provided arrays)</p>
<p> </p>
<h4>Example:</h4>
<p class="code">a1 = [1, 2, 3, 4, 5];<br />
Expand All @@ -68,7 +63,7 @@ <h4>Example:</h4>
<div>Next: <a data-xref="{title}" href="array_intersection.htm">array_intersection</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>
<!-- KEYWORDS
array_union
Expand Down

0 comments on commit c230368

Please sign in to comment.