Browse Source

Merge branch 'godotengine:master' into master

proffesionalusrnm 2 months ago
parent
commit
006ddd501d

+ 8 - 0
engine_details/development/compiling/compiling_for_ios.rst

@@ -74,6 +74,14 @@ The MoltenVK static ``.xcframework`` folder must also be placed in the
 ``ios_xcode`` folder once it has been created. MoltenVK is always statically
 linked on iOS; there is no dynamic linking option available, unlike macOS.
 
+.. warning::
+
+    Compiling for the iOS simulator is currently not supported as per
+    `GH-102149 <https://github.com/godotengine/godot/issues/102149>`__.
+
+    Apple Silicon Macs can run iOS apps natively, so you can run exported iOS projects
+    directly on an Apple Silicon Mac without needing the iOS simulator.
+
 Run
 ---
 

+ 9 - 0
tutorials/export/exporting_for_ios.rst

@@ -57,6 +57,15 @@ When the export completes, the output folder should look like this:
 
 .. image:: img/ios_export_output.webp
 
+
+.. warning::
+
+    Exporting for the iOS simulator is currently not supported as per
+    `GH-102149 <https://github.com/godotengine/godot/issues/102149>`__.
+
+    Apple Silicon Macs can run iOS apps natively, so you can run exported iOS projects
+    directly on an Apple Silicon Mac without needing the iOS simulator.
+
 Opening **exported_xcode_project_name.xcodeproj** lets you build and deploy
 like any other iOS app.
 

+ 4 - 0
tutorials/scripting/logging.rst

@@ -225,6 +225,8 @@ Here is a minimal working example of a custom logger, with the script added as a
         func _log_message(message: String, error: bool) -> void:
             # Do something with `message`.
             # `error` is `true` for messages printed to the standard error stream (stderr) with `print_error()`.
+            # Note that this method will be called from threads other than the main thread, possibly at the same
+            # time, so you will need to have some kind of thread-safety as part of it, like a Mutex.
             pass
 
         func _log_error(
@@ -239,6 +241,8 @@ Here is a minimal working example of a custom logger, with the script added as a
         ) -> void:
             # Do something with the error. The error text is in `rationale`.
             # See the Logger class reference for details on other parameters.
+            # Note that this method will be called from threads other than the main thread, possibly at the same
+            # time, so you will need to have some kind of thread-safety as part of it, like a Mutex.
             pass
 
     # Use `_init()` to initialize the logger as early as possible, which ensures that messages