Skip to content

Commit 94616da

Browse files
livecodesebastienlivecodesebastien
committed
Merge branch 'develop-6.7' into develop-7.0
Conflicts: engine/src/deploy.cpp engine/src/deploy.h engine/src/dispatch.cpp engine/src/dispatch.h engine/src/externalv0.cpp engine/src/mblandroidmisc.cpp engine/src/mblandroidstore.cpp engine/src/mbliphoneextra.mm engine/src/mbliphoneplayer.mm engine/src/mbliphonestore.mm engine/src/mblstore.cpp engine/src/mblstore.h engine/src/mode_standalone.cpp engine/src/util.cpp libexternal/src/external.c thirdparty util/weak_stub_maker.pl
2 parents 085c7bf + 0b7da72 commit 94616da

74 files changed

Lines changed: 4635 additions & 717 deletions

Some content is hidden

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

‎docs/dictionary/command/iphoneSetStatusBarStyle.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<doc> <legacy_id></legacy_id> <name>iphoneSetStatusBarStyle</name> <type>command</type> <syntax> <example>iphoneSetStatusBarStyle <i>style</i></example> </syntax> <synonyms> </synonyms> <summary>Controls the style of the iOS status bar.</summary> <examples><example>iphoneSetStatusBarStyle tStyle</example><example>iphoneSetStatusBarStyle &quot;translucent&quot;</example> </examples> <history> <introduced version="4.5.2">Added</introduced> <deprecated version=""></deprecated> <removed version=""></removed> </history> <objects> </objects> <platforms> <ios/> </platforms> <classes> <mobile/> </classes> <security> </security> <classification> </classification> <references> <command tag="mobileHideStatusBar">mobileHideStatusBar Command</command> <command tag="mobileShowStatusBar">mobileShowStatusBar Command</command> </references> <description> <overview>Use <b>iphoneSetStatusBarStyle</b> to change the style of the iOS status bar.</overview> <parameters> <parameter> <name>style</name> <description>The style of the iOS status bar.</description> <options title=""> <option> <item>default</item> <description>The default mode for the device.</description> </option> <option> <item>translucent</item> <description>Semi-transparent status bar (in this case the stack appears underneath it).</description> </option> <option> <item>opaque</item> <description>A black status bar (in this case the stack appears below it).</description> </option> </options> </parameter> </parameters> <value></value> <comments></comments> </description></doc>
1+
<doc> <legacy_id></legacy_id> <name>iphoneSetStatusBarStyle</name> <type>command</type> <syntax> <example>iphoneSetStatusBarStyle <i>style</i></example> </syntax> <synonyms> </synonyms> <summary>Controls the style of the iOS status bar.</summary> <examples><example>iphoneSetStatusBarStyle tStyle</example><example>iphoneSetStatusBarStyle "translucent"</example> </examples> <history> <introduced version="4.5.2">Added</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <ios/> </platforms> <classes> <mobile/> </classes> <security> </security> <classification> </classification> <references> <command tag="mobileHideStatusBar">mobileHideStatusBar Command</command> <command tag="mobileShowStatusBar">mobileShowStatusBar Command</command> </references> <description> <overview>Use <b>iphoneSetStatusBarStyle</b> to change the style of the iOS status bar.</overview> <parameters> <parameter> <name>style</name> <description>The style of the iOS status bar.</description> <options title=""> <option> <item>default</item> <description>The default mode for the device.</description> </option> <option> <item>translucent</item> <description>Semi-transparent status bar (in this case the stack appears underneath it).</description> </option> <option> <item>opaque</item> <description>A black status bar (in this case the stack appears below it in pre-iOS 7, and underneath it in iOS 7+).</description> </option> <option> <item>solid</item> <description>A black status bar (in this case the stack appears below it).</description> </option> </options> </parameter> </parameters> <value></value> <comments></comments> </description></doc>

‎docs/dictionary/property/printMargins.xml‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1 @@
1-
<doc>
2-
<legacy_id>2421</legacy_id>
3-
<name>printMargins</name>
4-
<type>property</type>
5-
<syntax>
6-
<example>set the printMargins to <i>left</i>,<i>top</i>,<i>right</i>,<i>bottom</i></example>
7-
</syntax>
8-
<library></library>
9-
<objects>
10-
<global/>
11-
</objects>
12-
<synonyms>
13-
</synonyms>
14-
<classification>
15-
<category>Printing</category>
16-
</classification>
17-
<references>
18-
<command tag="answer printer">answer printer Command</command>
19-
<command tag="answer page setup">answer page setup Command</command>
20-
<property tag="printCardBorders">printCardBorders Property</property>
21-
<property tag="printRowsFirst">printRowsFirst Property</property>
22-
<property tag="printGutters">printGutters Property</property>
23-
</references>
24-
<history>
25-
<introduced version="1.0">Added.</introduced>
26-
</history>
27-
<platforms>
28-
<mac/>
29-
<windows/>
30-
<linux/>
31-
<ios/>
32-
</platforms>
33-
<classes>
34-
<desktop/>
35-
<server/>
36-
<web/>
37-
<mobile/>
38-
</classes>
39-
<security>
40-
<printing/>
41-
</security>
42-
<summary>Specifies the width of the page margins when printing <glossary tag="card">cards</glossary>.</summary>
43-
<examples>
44-
<example>set the printMargins to 72,144,72,144 </example>
45-
</examples>
46-
<description>
47-
<p>Use the <b>printMargins</b> <glossary tag="property">property</glossary> to control how much blank space is left at each edge of the page when printing.</p><p/><p><b>Value:</b></p><p>The <b>printMargins</b> consists of four <href tag="../glossary/nondashnegative.xml">non-negative</href> <glossary tag="integer">integers</glossary>, separated by commas.</p><p/><p>By default, the <b>printMargins</b> is set to 72,72,72,72 (a one-inch margin on each side).</p><p/><p><b>Comments:</b></p><p>The <i>left</i> is the width in <property tag="points">points</property> of blank space between the left edge of the page and the leftmost edge of the printed <glossary tag="card">cards</glossary>. (There are 72 <property tag="points">points</property> to an inch.)</p><p/><p>The <i>top</i> is the height in <property tag="points">points</property> of blank space between the top edge of the page and the topmost edge of the printed <glossary tag="card">cards</glossary>.</p><p/><p>The <i>right</i> is the width in <property tag="points">points</property> of blank space between the right edge of the page and the rightmost edge of the printed <glossary tag="card">cards</glossary>.</p><p/><p>The <i>bottom</i> is the height in <property tag="points">points</property> of blank space between the bottom edge of the page and the bottommost edge of the printed <glossary tag="card">cards</glossary>.</p>
48-
</description>
49-
</doc>
1+
<doc> <legacy_id>2421</legacy_id> <name>printMargins</name> <type>property</type> <syntax> <example>set the printMargins to <i>left</i>,<i>top</i>,<i>right</i>,<i>bottom</i></example> </syntax> <synonyms> </synonyms> <summary>Specifies the width of the page margins when printing <glossary tag="card">cards</glossary>.</summary> <examples><example>set the printMargins to 72,144,72,144 </example> </examples> <history> <introduced version="1.0">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> <global/> </objects> <platforms> <mac/> <windows/> <linux/> <ios/> </platforms> <classes> <desktop/> <server/> <web/> <mobile/> </classes> <security> <printing/> </security> <classification> <category>Printing</category> </classification> <references> <command tag="answer printer">answer printer Command</command> <command tag="answer page setup">answer page setup Command</command> <property tag="printCardBorders">printCardBorders Property</property> <property tag="printRowsFirst">printRowsFirst Property</property> <property tag="printGutters">printGutters Property</property> </references> <description>Use the <b>printMargins</b> <glossary tag="property">property</glossary> to control how much blank space is left at each edge of the page when printing.<p></p><p><b>Value:</b></p><p>The <b>printMargins</b> consists of four non-negative <glossary tag="integer">integers</glossary>, separated by commas.</p><p></p><p>By default, the <b>printMargins</b> is set to 72,72,72,72 (a one-inch margin on each side).</p><p></p><p><b>Comments:</b></p><p>The <i>left</i> is the width in <property tag="points">points</property> of blank space between the left edge of the page and the leftmost edge of the printed <glossary tag="card">cards</glossary>. (There are 72 <property tag="points">points</property> to an inch.)</p><p></p><p>The <i>top</i> is the height in <property tag="points">points</property> of blank space between the top edge of the page and the topmost edge of the printed <glossary tag="card">cards</glossary>.</p><p></p><p>The <i>right</i> is the width in <property tag="points">points</property> of blank space between the right edge of the page and the rightmost edge of the printed <glossary tag="card">cards</glossary>.</p><p></p><p>The <i>bottom</i> is the height in <property tag="points">points</property> of blank space between the bottom edge of the page and the bottommost edge of the printed <glossary tag="card">cards</glossary>.</p><p></p><p>Set this property before calling the "open printing" or "open printing to pdf" command, to apply the new value to the current print run.</p></description></doc>

‎docs/notes/bugfix-11544.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# iOS 7 Status Bar Hidden, not hidden when use iPhonePickPhoto

‎docs/notes/bugfix-14011.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Printing is inconsistent

‎docs/notes/bugfix-14140.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Location of modal stacks incorrect on OSX

‎docs/notes/bugfix-14450.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Google Play Store - Extra error message when an in-app purchase fails

‎docs/notes/bugfix-14456.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Google Play Store - No Information on Product Details

‎docs/notes/bugfix-14461.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [[ In-app purchase ]] mobileStorePurchasedProducts returns empty on iOS

‎docs/notes/bugfix-14483.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# fiddling with alphaData crashes/hangs LC 7.0.2

‎docs/notes/bugfix-14525.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# video controller not responding, end of video crashes app (ios)

0 commit comments

Comments
 (0)