[Scummvm-git-logs] scummvm branch-2-3 -> 5a867e64238cd83a77478eecc19ab5bb7b07aefc

[criezy]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8ccd1ec406 OSX: Prefer the manual bundled with the application
3f400fb4c2 DOC: Add image to show ios release builds with Xcode
5a867e6423 DOC: Fix missing blank line after markup


Commit: 8ccd1ec40630bda4893d6a781e046587f50e5f1a
    https://github.com/scummvm/scummvm/commit/8ccd1ec40630bda4893d6a781e046587f50e5f1a
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-08-28T20:31:33+01:00

Commit Message:
OSX: Prefer the manual bundled with the application

The User Manual Help menu item now opens the pdf bundled with the
application if present, and only opens the website otherwise.
The bundled documentation is preferred as:
 - This will work even with no internet access
 - This is future proof and will still work in 10 years when the
   website URL might have changed or the website may be down.
 - This ensure we get the doc that corresponds to the version of
   ScummVM being used.

Changed paths:
    backends/platform/sdl/macosx/appmenu_osx.mm


diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index 598e7272b6..cf4c3d0000 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -135,6 +135,21 @@ static void openFromBundle(NSString *file) {
 }
 
 - (void)openUserManual {
+	// If present locally in the bundle, open that file.
+	if ([[NSFileManager defaultManager] respondsToSelector:@selector(contentsOfDirectoryAtPath:error:)]) {
+		NSString *bundlePath = [[NSBundle mainBundle] resourcePath];
+		NSArray *dirContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:bundlePath error:nil];
+		NSEnumerator *dirEnum = [dirContents objectEnumerator];
+		NSString *file;
+		while (file = [dirEnum nextObject]) {
+			if ([file hasPrefix:@"ScummVM Manual"] && [file hasSuffix:@".pdf"]) {
+				[[NSWorkspace sharedWorkspace] openFile:[bundlePath stringByAppendingPathComponent:file]];
+				return;
+			}
+		}
+	}
+
+	// Otherwise try to access the only version.
 	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://docs.scummvm.org/"]];
 }
 


Commit: 3f400fb4c2247dc6223e5d60af30a8bff3a637f9
    https://github.com/scummvm/scummvm/commit/3f400fb4c2247dc6223e5d60af30a8bff3a637f9
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-08-28T20:31:47+01:00

Commit Message:
DOC: Add image to show ios release builds with Xcode

Changed paths:
  A doc/docportal/images/ios/ios_xcode_release.gif
    doc/docportal/other_platforms/ios.rst


diff --git a/doc/docportal/images/ios/ios_xcode_release.gif b/doc/docportal/images/ios/ios_xcode_release.gif
new file mode 100644
index 0000000000..6b1de9fa84
Binary files /dev/null and b/doc/docportal/images/ios/ios_xcode_release.gif differ
diff --git a/doc/docportal/other_platforms/ios.rst b/doc/docportal/other_platforms/ios.rst
index 057bc621fe..0c2e92bb89 100644
--- a/doc/docportal/other_platforms/ios.rst
+++ b/doc/docportal/other_platforms/ios.rst
@@ -106,6 +106,10 @@ When Xcode is open, connect a device to install ScummVM onto. At the top of the
 
 You may need to disable bitcode generation in the build settings. This should already be disabled by default when you make a build specifically for your device, but it is enabled by default when you build for a ''Generic iOS Device''.
 
+Unless you want to debug issues with ScummVM on iOS, you probably want to compile ScummVM in release mode to get better performances when playing games.
+
+.. figure:: ../images/ios/ios_xcode_release.gif
+
 The last step before building ScummVM is to change the bundle identifier and manage signing. Click on the **scummvm** project in the left pane, and then click on **ScummVM - iOS** under **TARGETS**. On the menu bar above, click on **General**. Under **Identity** there is a field labeled **Bundle Identifier**. Enter a unique identifier in reverse-DNS format. This can be as simple as com.\ *yournamehere*.
 
 .. figure:: ../images/ios/identifier.gif


Commit: 5a867e64238cd83a77478eecc19ab5bb7b07aefc
    https://github.com/scummvm/scummvm/commit/5a867e64238cd83a77478eecc19ab5bb7b07aefc
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-08-28T20:31:56+01:00

Commit Message:
DOC: Fix missing blank line after markup

Changed paths:
    doc/docportal/advanced_topics/understand_graphics.rst


diff --git a/doc/docportal/advanced_topics/understand_graphics.rst b/doc/docportal/advanced_topics/understand_graphics.rst
index 4149d4f894..fd2bba097e 100644
--- a/doc/docportal/advanced_topics/understand_graphics.rst
+++ b/doc/docportal/advanced_topics/understand_graphics.rst
@@ -14,6 +14,7 @@ For the SDL Surface graphics mode, the scaler is applied first, then the aspect
 Render modes are only applicable to some older games that were designed to be played on multiple systems, and lets us choose which system's graphics to replicate.
 
 .. _graphics:
+
 Graphics modes
 ---------------------------
 
@@ -172,6 +173,7 @@ The game may be stretch horizontally or vertically to fill the window. This mode
 To switch between stretch modes, press :kbd:`Ctrl+Alt+s`.
 
 .. _filter:
+
 Render mode
 -------------