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

YoYoGames · Oct 4, 2024 · 3c493cb · 3c493cb
2 parents 2500a95 + 29e35e7
commit 3c493cb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/...aker_Language/GML_Reference/Asset_Management/Audio/Audio_Buffers/audio_stop_recording.htm b/...aker_Language/GML_Reference/Asset_Management/Audio/Audio_Buffers/audio_stop_recording.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>audio_stop_recording</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" />
@@ -16,10 +16,10 @@
 <body><!--<div class="body-scroll" style="top: 150px;">--><h1>audio_stop_recording</h1><p> 이 함수는 주어진 레코더 채널에서 녹화를 중지합니다(함수를 호출할 때 채널 인덱스가 반환됩니다.<a href="audio_start_recording.htm"><span class="inline">audio_start_recording()</span></a> ). 녹음을 중지하면 지정된 레코더 채널에 대해 더 이상 <a href="../../../../../The_Asset_Editors/Object_Properties/Async_Events/Audio_Recording.htm">오디오 녹음 비동기식 이벤트</a> 가 트리거되지 않으므로 일반적으로 실제 비동기식 이벤트에서 이 기능을 사용하여 모든 데이터를 캡처했는지 확인합니다.</p><p class="note"> <b><span class="note">참고</span></b> 대부분의 플랫폼은 어떤 형태로든 오디오 녹음을 지원하지만 플랫폼이 지원하더라도 모든 장치에서 허용한다는 의미는 아니므로 항상 다음을 확인해야 합니다.<span style="font-size:1px;"><a href="audio_get_recorder_count.htm"><span class="inline">audio_get_recorder_count()</span></a></span> 이 함수는 나머지 녹음 기능을 사용하기 전에 녹음 장치를 사용할 수 있는지 확인하기 위해 0보다 큰 값을 반환합니다.</p><p></p><h4> 통사론:</h4><p class="code">audio_stop_recording(channel_index);</p><table><tbody><tr><th> 논쟁</th><th> 유형</th><th> 설명</th></tr><tr><td> <span class="notranslate">channel_index</span></td><td> <span data-keyref="Type_Real"><a href="../../../../../../GameMaker_Language/GML_Overview/Data_Types.htm" target="_blank">진짜</a></span></td><td> <span class="notranslate">The index of the recorder channel to stop.</span></td></tr></tbody></table><p></p><h4> 보고:</h4><p class="code"><span data-keyref="Type_Void">N/A</span></p><p></p><h4> 예시:</h4><p class="code">audio_stop_recording(audio_channel);</p><p> 위의 코드는 <span data-keyref="GameMaker Name">GameMaker</span> 에게 주어진 오디오 채널 인덱스에서 녹음을 중지하도록 지시합니다. </p><p></p><p></p><p></p><div class="footer"><div class="buttons"><div class="clear"><div style="float:left"> 뒤로: <a href="../Audio.htm">오디오 버퍼</a></div><div style="float:right"> 다음: <a href="audio_get_recorder_count.htm"><span class="notranslate">audio_get_recorder_count</span></a></div></div></div><h5> <span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2022 All Rights Reserved</span></h5>
   </div>
   <!-- KEYWORDS
-udio_stop_recording
+audio_stop_recording
 -->
   <!-- TAGS
-udio_stop_recording
+audio_stop_recording
 -->
 </body>
 </html>
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
@@ -16,13 +16,7 @@
 <body>
   <h1><span data-field="title" data-format="default">audio_throw_on_error</span></h1>
   <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>
-  <p>The following functions are exceptions and will always throw errors regardless of what you pass this function:</p>
-  <ul class="colour">
-    <li><a data-xref="{title}" href="audio_play_sound.htm">audio_play_sound</a></li>
-    <li><a data-xref="{title}" href="audio_play_sound_at.htm">audio_play_sound_at</a></li>
-    <li><a data-xref="{title}" href="Audio_Emitters/audio_play_sound_on.htm">audio_play_sound_on</a></li>
-    <li><a data-xref="{title}" href="Audio_Synchronisation/audio_play_in_sync_group.htm">audio_play_in_sync_group</a></li>
-  </ul>
+  <div data-conref="../../../../assets/snippets/HTML5_Not_Available.hts"> </div>
   <p> </p>
   <ul class="colour">
   </ul>

diff --git a/.../GameMaker_Language/GML_Reference/Asset_Management/Objects/Object_Events/event_object.htm b/.../GameMaker_Language/GML_Reference/Asset_Management/Objects/Object_Events/event_object.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>event_object</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/SupportFiles/layout_fix_append.css b/SupportFiles/layout_fix_append.css
@@ -14,7 +14,7 @@ body.media-mobile div.functionbar {
 	z-index: 1 !important;
 }
 
-.GlossaryTermText {
+body.media-mobile .GlossaryTermText {
 	color: #444;
 }