Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 185a9f0

Browse files
Merge branch 'develop' into merge_6-7-rc-3
Conflicts: builder/builder.rev builder/tools_builder.rev builder/tools_installer.rev engine/engine-mobile.xcodeproj/project.pbxproj engine/engine.xcodeproj/project.pbxproj engine/src/cmds.h engine/src/deploy_macosx.cpp engine/src/dispatch.cpp engine/src/dispatch.h engine/src/image_rep_encoded.cpp engine/src/mac-color.mm engine/src/mbliphoneapp.mm engine/src/mbliphonecontact.mm engine/src/mbliphonedialog.mm engine/src/mbliphoneextra.mm engine/src/mbliphonepick.mm engine/src/mbliphonepickdate.mm engine/src/mbliphoneplayer.mm engine/src/mblsensor.cpp engine/src/object.h engine/src/player-platform.cpp engine/src/player-platform.h engine/src/stacklst.cpp engine/src/sysunxthreads.cpp ide prebuilt thirdparty version
2 parents 447cc49 + b3a5616 commit 185a9f0

File tree

135 files changed

+8325
-1129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+8325
-1129
lines changed

builder/builder.rev

629 Bytes
Binary file not shown.

builder/tools_builder.rev

294 Bytes
Binary file not shown.

builder/tools_installer.rev

-229 KB
Binary file not shown.

docs/dictionary/command/mobilePickPhoto.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<doc> <legacy_id></legacy_id> <name>mobilePickPhoto</name> <type>command</type> <syntax> <example>mobilePickPhoto <i>source</i> [, <i>maxwidth</i> [, <i>maxheight</i>] ] </example> </syntax> <synonyms> <synonym>iphonePickPhoto</synonym> </synonyms> <summary>Displays the iPhone or Android native photo picker.</summary> <examples><example>mobilePickPhoto &quot;library&quot;</example><example>mobilePickPhoto &quot;front camera&quot;, 250, 250</example> </examples> <history> <introduced version="4.5.2">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <changed version="4.6.1">4.6.1</changed> </history> <objects> </objects> <platforms> <ios/> <android/> </platforms> <classes> <mobile/> </classes> <security> </security> <classification> </classification> <references> </references> <description> <overview>Use the <b>mobilePickPhoto</b> command to allow the user to select an image.</overview> <parameters> <parameter> <name>source</name> <description>The source for the image. One of:</description> <options title=""> <option> <item>library</item> <description/> </option> <option> <item>album</item> <description/> </option> <option> <item>camera</item> <description/> </option> <option> <item>rear camera</item> <description>iOS only</description> </option> <option> <item>front camera</item> <description>iOS only</description> </option> </options> </parameter> <parameter> <name>maxwidth</name> <description>The maximum allowed width of the image.</description> </parameter> <parameter> <name>maxheight</name> <description>The maximum allowed height of the image.</description> </parameter> </parameters> <value></value> <comments>The <b>mobilePickPhoto</b> displays the iPhone or Android native photo picker, allowing the user to select a photo from the device&apos;s photo library, take a photo using the device cameras or select a photo from the device&apos;s recent camera roll.<p></p><p>When running on an iPhone or Android, the photo-picker is displayed using the standard iOS fullscreen overlay view. When running on an iPad, the photo-picker is displayed using a standard iOS pop-over. In this case, the pop-over is positioned relative to the rect of the target at the time the <b>mobilePickPhoto</b> command was called.</p><p></p><p>If the <i>source</i> type is not available on the target device, the command returns with result source not available. If the user cancels the pick, the command returns with result cancel. Otherwise a new image object is created on the current card of the default stack containing the chosen image.</p><p></p><p>The <i>maxwidth</i> and <i>maxheight</i> parameters are only available on iOS devices and constrain the maximum size of an image. The chosen image is scaled down proportionally to fit within the size specified. If either size specified is 0, then the parameter is ignored.</p><p></p><p></p><p></p><note>The image object is cloned from the <keyword tag="templateImage">templateImage</keyword>, so you can use this to configure settings before calling the picker.</note><p></p><p></p><p></p><note>Android: <b>mobilePickPhoto</b> requires &apos;Camera&apos; and &apos;External Storage&apos; permissions. Set these in the standalone application settings pane. Not setting this permission will result in a &quot;could not create temporary image file&quot; error.</note></comments> </description></doc>
1+
<doc> <legacy_id></legacy_id> <name>mobilePickPhoto</name> <type>command</type> <syntax> <example>mobilePickPhoto <i>source</i> [, <i>maxwidth</i> [, <i>maxheight</i>] ] </example> </syntax> <synonyms> <synonym>iphonePickPhoto</synonym> </synonyms> <summary>Displays the iPhone or Android native photo picker.</summary> <examples><example>mobilePickPhoto &quot;library&quot;</example><example>mobilePickPhoto &quot;front camera&quot;, 250, 250</example> </examples> <history> <introduced version="4.5.2">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <changed version="4.6.1">4.6.1</changed> </history> <objects> </objects> <platforms> <ios/> <android/> </platforms> <classes> <mobile/> </classes> <security> </security> <classification> </classification> <references> </references> <description> <overview>Use the <b>mobilePickPhoto</b> command to allow the user to select an image.</overview> <parameters> <parameter> <name>source</name> <description>The source for the image. One of:</description> <options title=""> <option> <item>library</item> <description/> </option> <option> <item>album</item> <description/> </option> <option> <item>camera</item> <description/> </option> <option> <item>rear camera</item> <description>iOS only</description> </option> <option> <item>front camera</item> <description>iOS only</description> </option> </options> </parameter> <parameter> <name>maxwidth</name> <description>The maximum allowed width of the image.</description> </parameter> <parameter> <name>maxheight</name> <description>The maximum allowed height of the image.</description> </parameter> </parameters> <value></value> <comments>The <b>mobilePickPhoto</b> displays the iPhone or Android native photo picker, allowing the user to select a photo from the device&apos;s photo library, take a photo using the device cameras or select a photo from the device&apos;s recent camera roll.<p></p><p>When running on an iPhone or Android, the photo-picker is displayed using the standard iOS fullscreen overlay view. The same happens when running on an iPad and the supported orientations for the app contain any of landscape right, landscape left, portrait upside down. On the contrary, when running on an iPad and the supported orientations for the app contain only portrait, then the photo-picker is displayed using a standard iOS pop-over. In this case, the pop-over is positioned relative to the rect of the target at the time the <b>mobilePickPhoto</b> command was called.</p><p></p><p>If the <i>source</i> type is not available on the target device, the command returns with result source not available. If the user cancels the pick, the command returns with result cancel. Otherwise a new image object is created on the current card of the default stack containing the chosen image.</p><p></p><p>The <i>maxwidth</i> and <i>maxheight</i> parameters are only available on iOS devices and constrain the maximum size of an image. The chosen image is scaled down proportionally to fit within the size specified. If either size specified is 0, then the parameter is ignored.</p><p></p><p></p><p></p><note>The image object is cloned from the <keyword tag="templateImage">templateImage</keyword>, so you can use this to configure settings before calling the picker.</note><p></p><p></p><p></p><note>Android: <b>mobilePickPhoto</b> requires &apos;Camera&apos; and &apos;External Storage&apos; permissions. Set these in the standalone application settings pane. Not setting this permission will result in a &quot;could not create temporary image file&quot; error.</note></comments> </description></doc>

docs/notes/bugfix-11968.md

Lines changed: 2 additions & 0 deletions

docs/notes/bugfix-12142.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-12464.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-12876.md

Lines changed: 2 additions & 0 deletions

docs/notes/bugfix-13208.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-13236.md

Lines changed: 1 addition & 0 deletions

0 commit comments

Comments
 (0)