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

YoYoGames · Jul 15, 2024 · f88b69c · f88b69c
2 parents 1151a5e + 25cf0b7
commit f88b69c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...tents/GameMaker_Language/GML_Reference/Asset_Management/Shaders/shaders_are_supported.htm b/...tents/GameMaker_Language/GML_Reference/Asset_Management/Shaders/shaders_are_supported.htm
@@ -26,9 +26,9 @@ <h4>Les retours :</h4>
   <p> </p>
   <h4>Exemple :</h4>
   <p class="code">global.GFX = false;<br />
-    if (shaders_are_supported()) <br />
+    if (shaders_are_supported())<br />
     {<br />
-        if (shader_is_compiled(sh_glass) &amp;&amp; shader_is_compiled(sh_warp)) <br />
+        if (shader_is_compiled(sh_glass) &amp;&amp; shader_is_compiled(sh_warp))<br />
         {<br />
             global.GFX = true;<br />
         }<br />

diff --git a/Manual/contents/Settings/Game_Options/Ubuntu.htm b/Manual/contents/Settings/Game_Options/Ubuntu.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>Ubuntu</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/Images/IDE_Input/Help_Menu_Report_Bug_Window.png b/Manual/contents/assets/Images/IDE_Input/Help_Menu_Report_Bug_Window.png