Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
This repository was archived by the owner on Sep 7, 2021. It is now read-only.

Commit 7bb4c23

Browse filesBrowse files
committed
Merge remote-tracking branch 'upstream/develop-9.6' into merge-develop-9.6-08.06.2021
2 parents d068896 + 7082605 commit 7bb4c23
Copy full SHA for 7bb4c23

File tree

Expand file treeCollapse file tree

83 files changed

+806
-240
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

83 files changed

+806
-240
lines changed

‎Installer/package.txt

Copy file name to clipboardExpand all lines: Installer/package.txt
+101-101Lines changed: 101 additions & 101 deletions
Large diffs are not rendered by default.

‎Makefile

Copy file name to clipboardExpand all lines: Makefile
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ EMMAKE ?= emmake
2525

2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
28-
IPHONEOS_VERSIONS ?= 10.2 11.2 12.1 13.2 14.4
29-
IPHONESIMULATOR_VERSIONS ?= 10.2 11.2 12.1 13.2 14.4
30-
SKIP_IPHONEOS_VERSIONS ?= 9.2
31-
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2
28+
IPHONEOS_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
29+
IPHONESIMULATOR_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
30+
SKIP_IPHONEOS_VERSIONS ?= 9.2 10.2
31+
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2
3232

3333

3434
IOS_SDKS ?= \

‎config.py

Copy file name to clipboardExpand all lines: config.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
'x86-android-ndk16r15',
3232
'x86_64-android-ndk16r15',
3333
'universal-mac-macosx10.9', # Minimum deployment target
34+
'universal-ios-iphoneos14.5',
3435
'universal-ios-iphoneos14.4',
3536
'universal-ios-iphoneos13.2',
3637
'universal-ios-iphoneos12.1',
3738
'universal-ios-iphoneos11.2',
38-
'universal-ios-iphoneos10.2',
39+
'universal-ios-iphonesimulator14.5',
3940
'universal-ios-iphonesimulator14.4',
4041
'universal-ios-iphonesimulator13.2',
4142
'universal-ios-iphonesimulator12.1',
4243
'universal-ios-iphonesimulator11.2',
43-
'universal-ios-iphonesimulator10.2',
4444
'x86-win32', # TODO[2017-03-23] More specific ABI
4545
'x86_64-win32',
4646
'js-emscripten-sdk1.35',

‎config/mac.gypi

Copy file name to clipboardExpand all lines: config/mac.gypi
+17-1Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
'STRIP_INSTALLED_PRODUCT': 'NO',
3131
'CLANG_LINK_OBJC_RUNTIME': 'NO',
3232
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
33-
'CLANG_CXX_LIBRARY': 'libc++'
33+
'CLANG_CXX_LIBRARY': 'libc++'
3434
},
3535

3636
'target_defaults':
@@ -47,6 +47,7 @@
4747
'debug_info_suffix': '.dSYM',
4848

4949
'silence_warnings': 0,
50+
'travis': '<!(echo ${TRAVIS})',
5051
},
5152

5253
'target_conditions':
@@ -70,6 +71,21 @@
7071
],
7172
},
7273
],
74+
[
75+
'travis == ""',
76+
{
77+
'xcode_settings':
78+
{
79+
'OTHER_LDFLAGS':
80+
[
81+
'-Wl,-platform_version',
82+
'-Wl,macos',
83+
'-Wl,10.9',
84+
'-Wl,10.9',
85+
],
86+
},
87+
},
88+
],
7389
[
7490
# Non-bundle loadable module should have a .dylib suffix
7591
# and be linked as libraries, not bundles
+40Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
Name: iphoneAllowBackgroundLocationUpdates
2+
3+
Type: command
4+
5+
Syntax: iphoneAllowBackgroundLocationUpdates <pAllow>
6+
7+
Summary:
8+
Allows the app to receive location updates when it is suspended
9+
10+
Introduced: 9.6.3
11+
12+
OS: ios
13+
14+
Platforms: mobile
15+
16+
Example:
17+
mobileStartTrackingSensor "location"
18+
iphoneAllowBackgroundLocationUpdates "true"
19+
20+
Example:
21+
iphoneAllowBackgroundLocationUpdates "false"
22+
23+
Parameters:
24+
pAllow (boolean):
25+
A boolean value specifying if the app should continue to receive
26+
location updates when put in the background.
27+
28+
29+
Description:
30+
Use the <iphoneAllowBackgroundLocationUpdates> command to allow (or disallow) the app
31+
receiving location updates when it is suspended.
32+
33+
This command has an effect only if "Location Update" is checked in the
34+
"Background Execution" section in the iOS standalone settings.
35+
36+
37+
38+
References: mobileStartTrackingSensor (command), mobileStopTrackingSensor (command),
39+
40+

‎docs/dictionary/command/replace.lcdoc

Copy file name to clipboardExpand all lines: docs/dictionary/command/replace.lcdoc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ replace only an exact <string> of text.
5656
> For example:
5757

5858
put "x:y:y:y:y:x:" into tChangeMe
59-
replace ":y:" with empty in tChangeMe
59+
replace ":y:" with "::" in tChangeMe
6060
put tChangeMe -- returns x::y::y:x
6161

6262
> If the goal were to remove every lone y within two colons that appears

‎docs/dictionary/command/revCloseVideoGrabber.lcdoc

Copy file name to clipboardExpand all lines: docs/dictionary/command/revCloseVideoGrabber.lcdoc
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Associations: video library
1212

1313
Introduced: 2.0
1414

15+
Deprecated: 9.0
16+
1517
OS: windows
1618

1719
Platforms: desktop

‎docs/dictionary/command/revInitializeVideoGrabber.lcdoc

Copy file name to clipboardExpand all lines: docs/dictionary/command/revInitializeVideoGrabber.lcdoc
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Associations: video library
1111

1212
Introduced: 2.0
1313

14+
Deprecated: 9.0
15+
1416
OS: windows
1517

1618
Platforms: desktop

‎docs/dictionary/command/revSetVideoGrabberRect.lcdoc

Copy file name to clipboardExpand all lines: docs/dictionary/command/revSetVideoGrabberRect.lcdoc
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Associations: video library
1212

1313
Introduced: 2.0
1414

15+
Deprecated: 9.0
16+
1517
OS: windows
1618

1719
Platforms: desktop

‎docs/dictionary/command/revVideoGrabDialog.lcdoc

Copy file name to clipboardExpand all lines: docs/dictionary/command/revVideoGrabDialog.lcdoc
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Associations: video library
1111

1212
Introduced: 2.0
1313

14+
Deprecated: 9.0
15+
1416
OS: windows
1517

1618
Platforms: desktop
+46Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
Name: iphoneTrackingAuthorizationStatus
2+
3+
Type: function
4+
5+
Syntax: iphoneTrackingAuthorizationStatus()
6+
7+
Summary:
8+
Returns the current tracking authorization status of the calling
9+
application.
10+
11+
Introduced: 9.6.3
12+
13+
OS: ios
14+
15+
Platforms: mobile
16+
17+
Example:
18+
local tStatus
19+
put iphoneTrackingAuthorizationStatus() into tStatus
20+
if tStatus is "denied" then
21+
answer "The app cannot track you"
22+
end if
23+
24+
Returns (enum):
25+
The <iphoneTrackingAuthorizationStatus> function returns one of the
26+
following strings:
27+
28+
- "not determined" - The user has not yet received a request to authorize access to
29+
app-related data that can be used for tracking the user or the device.
30+
- "restricted" - Authorization to access app-related data that can be used for tracking
31+
the user or the device is restricted.
32+
- "denied" - User has explicitly denied authorization to access app-related data that
33+
can be used for tracking the user or the device.
34+
- "authorized" - User has granted access to app-related data that can be used for
35+
tracking the user or the device.
36+
- "not supported" - Device runs a version of iOS lower than 14, where this
37+
feature is not supported
38+
39+
40+
Description:
41+
Use the <iphoneTrackingAuthorizationStatus> function to find the current
42+
tracking authorization status of the calling application.
43+
44+
This function is available in iOS 14 and above.
45+
46+

‎docs/dictionary/function/revXMLEvaluateXPath.lcdoc

Copy file name to clipboardExpand all lines: docs/dictionary/function/revXMLEvaluateXPath.lcdoc
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ OS: mac, windows, linux, ios, android
2020
Platforms: desktop, server, mobile
2121

2222
Example:
23-
put "/bookstore/book/[price&lt;40]/" into pXPathExpression
23+
put "/bookstore/book[price&lt;40]/" into pXPathExpression
2424
put revXMLEvaluateXPath(pDocID, pXPathExpression)
2525

2626
Description:
@@ -63,7 +63,7 @@ instance, given xml data of
6363

6464
then
6565

66-
put "/bookstore/book/[price&lt;40]/" into pXPathExpression
66+
put "/bookstore/book[price&lt;40]/" into pXPathExpression
6767
put revXMLEvaluateXPath(pDocID, pXPathExpression)
6868

6969
gives you

‎docs/dictionary/object/audioClip.lcdoc

Copy file name to clipboardExpand all lines: docs/dictionary/object/audioClip.lcdoc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ To stop an audioClip, use the syntax
6363
play stop
6464

6565
References: object type (glossary), card (object),
66-
templateAudioClip (keyword), stack (object), play (command)
66+
templateAudioClip (keyword), stack (object), play (command),
6767
audio clip (glossary), videoClip (object), control (glossary),
6868
stack file (glossary)
6969

‎docs/notes-base/platforms.md

Copy file name to clipboardExpand all lines: docs/notes-base/platforms.md
+6-5Lines changed: 6 additions & 5 deletions

‎docs/notes/bugfix-21906.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-21982.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-22999.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23015.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23085.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23096.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23104.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23119.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23126.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23130.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23150.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23154.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23160.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23166.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23167.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23172.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23173.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23176.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23183.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23193.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23208.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23212.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23220.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions

‎docs/notes/bugfix-23232.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
+6Lines changed: 6 additions & 0 deletions
+6Lines changed: 6 additions & 0 deletions

‎engine/kernel.gyp

Copy file name to clipboardExpand all lines: engine/kernel.gyp
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,15 @@
185185
'$(SDKROOT)/System/Library/Frameworks/MediaToolbox.framework',
186186
],
187187
},
188+
],
189+
[
190+
'OS == "ios" and target_sdk >= "14.0"',
191+
{
192+
'libraries':
193+
[
194+
'$(SDKROOT)/System/Library/Frameworks/AppTrackingTransparency.framework',
195+
],
196+
},
188197
],
189198
[
190199
'OS == "ios"',

‎engine/rsrc/android-manifest.xml

Copy file name to clipboardExpand all lines: engine/rsrc/android-manifest.xml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ${USES_PERMISSION}${USES_FEATURE}
2121
android:windowSoftInputMode="stateHidden"
2222
android:launchMode="singleTask"
2323
android:hardwareAccelerated="${HARDWARE_ACCELERATED}">
24+
${ALLOW_HTTP_CONNECTIONS}
2425
<intent-filter>
2526
<action android:name="android.intent.action.MAIN" />
2627
<category android:name="android.intent.category.LAUNCHER" />

‎engine/rsrc/mobile-device-template.plist

Copy file name to clipboardExpand all lines: engine/rsrc/mobile-device-template.plist
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
<key>NSBluetoothAlwaysUsageDescription</key>
131131
<string>This application requires access to Bluetooth always</string>
132132
${HEALTHKIT}
133+
${APP_TRACKING_TRANSPARENCY}
133134
<key>LSApplicationQueriesSchemes</key>
134135
<array>
135136
${APP_URL_WHITELIST}

‎engine/rsrc/mobile-template.plist

Copy file name to clipboardExpand all lines: engine/rsrc/mobile-template.plist
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@
5252
<key>UIBackgroundModes</key>
5353
<array>
5454
${PLAY_AUDIO_WHEN_IN_BACKGROUND}
55+
${BACKGROUND_LOCATION_UPDATE}
56+
${BACKGROUND_VOIP}
57+
${BACKGROUND_NEWSSTAND_DOWNLOADS}
58+
${EXTERNAL_ACC_COMM}
59+
${USE_BT_LE}
60+
${ACTS_AS_BT_LE}
61+
${BACKGROUND_FETCH}
62+
${REMOTE_NOTIFICATIONS}
5563
</array>
5664
<key>UIViewControllerBasedStatusBarAppearance</key>
5765
<false/>
@@ -94,6 +102,7 @@
94102
<string>This application requires access to Photo Library</string>
95103
<key>NSBluetoothAlwaysUsageDescription</key>
96104
<string>This application requires access to Bluetooth always</string>
105+
${APP_TRACKING_TRANSPARENCY}
97106
${HEALTHKIT}
98107
${UI_STYLE}
99108
</dict>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.