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

Commit addc9d1

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'upstream/develop-9.0' into merge-develop_9.0-24.07.18
2 parents 172f8e0 + cbe6679 commit addc9d1

Some content is hidden

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

57 files changed

+868
-177
lines changed

‎builder/builder_utilities.livecodescript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "BuilderUtilities"
22

3-
constant kMergExtVersion = "2018-6-4"
4-
constant kTSNetVersion = "1.3.6"
3+
constant kMergExtVersion = "2018-6-22"
4+
constant kTSNetVersion = "1.3.7"
55

66
local sEngineDir
77
local sWorkDir

‎config.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
BUILDBOT_PLATFORM_TRIPLES = (
2626
'x86-linux-debian8',
2727
'x86_64-linux-debian8',
28-
'armv6-android-api26',
28+
'armv6-android-sdk26_ndk16r15',
2929
'universal-mac-macosx10.9', # Minimum deployment target
3030
'universal-ios-iphoneos11.4',
3131
'universal-ios-iphoneos11.2',
@@ -119,7 +119,8 @@ def exec_gyp(args):
119119
def process_env_options(opts):
120120
vars = ('OS', 'PLATFORM', 'GENERATOR_OUTPUT', 'FORMATS', 'DEPTH',
121121
'WIN_MSVS_VERSION', 'XCODE_TARGET_SDK', 'XCODE_HOST_SDK',
122-
'TARGET_ARCH', 'PERL', 'ANDROID_NDK_VERSION', 'ANDROID_PLATFORM',
122+
'TARGET_ARCH', 'PERL', 'ANDROID_NDK_VERSION',
123+
'ANDROID_NDK_PLATFORM_VERSION', 'ANDROID_PLATFORM',
123124
'ANDROID_SDK', 'ANDROID_NDK', 'ANDROID_BUILD_TOOLS',
124125
'ANDROID_TOOLCHAIN', 'ANDROID_API_VERSION',
125126
'AR', 'CC', 'CXX', 'LINK', 'OBJCOPY', 'OBJDUMP',
@@ -422,6 +423,9 @@ def validate_android_tools(opts):
422423
error('Android NDK not found; set $ANDROID_NDK')
423424
opts['ANDROID_NDK'] = ndk
424425

426+
if opts['ANDROID_NDK_PLATFORM_VERSION'] is None:
427+
opts['ANDROID_NDK_PLATFORM_VERSION'] = '16'
428+
425429
if opts['ANDROID_API_VERSION'] is None:
426430
opts['ANDROID_API_VERSION'] = '26'
427431

@@ -538,6 +542,7 @@ def configure_android(opts):
538542

539543
export_opts(opts, ('ANDROID_BUILD_TOOLS', 'ANDROID_NDK',
540544
'ANDROID_PLATFORM', 'ANDROID_SDK',
545+
'ANDROID_NDK_VERSION', 'ANDROID_NDK_PLATFORM_VERSION',
541546
'ANDROID_API_VERSION',
542547
'JAVA_SDK', 'AR', 'CC', 'CXX', 'LINK', 'OBJCOPY',
543548
'OBJDUMP', 'STRIP'))

‎config/android.gypi‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
'java_sdk_path%': '<!(echo ${JAVA_SDK})',
99
'android_sdk_path%': '<!(echo ${ANDROID_SDK})',
1010
'android_ndk_path%': '<!(echo ${ANDROID_NDK})',
11-
'android_api_version%': '<!(echo ${ANDROID_API_VERSION})',
11+
'android_api_version%': '<!(echo ${ANDROID_API_VERSION})',
12+
'android_ndk_platform_version%': '<!(echo ${ANDROID_NDK_PLATFORM_VERSION})',
13+
'android_ndk_version%': '<!(echo ${ANDROID_NDK_VERSION})',
1214
'android_platform%': '<!(echo ${ANDROID_PLATFORM})',
1315
'android_build_tools%': '<!(echo ${ANDROID_BUILD_TOOLS})',
1416
},
@@ -30,7 +32,7 @@
3032
'strip': '<!(echo ${STRIP:-strip})',
3133

3234
'android_ndk_path%': '<(android_ndk_path)',
33-
'android_api_version%': '<(android_api_version)',
35+
'android_subplatform%': 'sdk<(android_api_version)_ndk<(android_ndk_platform_version)<(android_ndk_version)',
3436
},
3537

3638
'target_defaults':

‎docs/development/build-android.md‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,10 @@ Update the SDK:
4141
Create a standalone toolchain (this simplifies setting up the build environment):
4242

4343
````bash
44-
<<<<<<< HEAD
45-
android-ndk-r14/build/tools/make_standalone_toolchain.py \
46-
--arch arm --api 19 \
47-
=======
4844
android-ndk-r15/build/tools/make_standalone_toolchain.py \
49-
--arch arm --api 26 \
50-
>>>>>>> upstream/develop-9.0
45+
--arch arm --api 16 --deprecated-headers \
5146
--install-dir ${HOME}/android/toolchain/standalone
52-
````
47+
```
5348

5449
Add a couple of symlinks to allow the engine configuration script to find the Android toolchain:
5550

@@ -86,6 +81,7 @@ AR="${BINDIR}/${TRIPLE}-ar"
8681

8782
# Android platform information
8883
ANDROID_NDK_VERSION=r15
84+
ANDROID_NDK_PLATFORM_VERSION=16
8985
ANDROID_API_VERSION=26
9086
ANDROID_PLATFORM=android-${ANDROID_API_VERSION}
9187
ANDROID_NDK=${TOOLCHAIN}/android-ndk-${ANDROID_NDK_VERSION}
@@ -95,7 +91,8 @@ ANDROID_LIB_PATH=${TOOLCHAIN}/standalone/${TRIPLE}/lib
9591

9692
export JAVA_SDK
9793
export CC CXX LINK AR
98-
export ANDROID_PLATFORM ANDROID_NDK ANDROID_SDK ANDROID_BUILD_TOOLS
94+
export ANDROID_PLATFORM ANDROID_NDK ANDROID_NDK_PLATFORM_VERSION
95+
export ANDROID_SDK ANDROID_BUILD_TOOLS
9996
export ANDROID_LIB_PATH ANDROID_API_VERSION
10097
````
10198

‎docs/dictionary/property/audioPan.lcdoc‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
Name: audioPan
2+
3+
Type: property
4+
5+
Syntax: set the audioPan of <player> to <positive/negative percentage>
6+
7+
Summary:
8+
Specifies the proportion of audio panned from one stereo channel to the other.
9+
10+
Introduced: 9.0.1
11+
12+
OS: mac
13+
14+
Platforms: desktop
15+
16+
Example:
17+
set the audioPan of player "myVideoPlayer" to 0 -- stereo channels unaffected
18+
19+
Example:
20+
set the audioPan of player "myVideoPlayer" to -50 -- 50% of the right channel audio moved to the left.
21+
22+
Example:
23+
set the audioPan of player "myVideoPlayer" to 100 -- 100% of the left channel audio moved to the right.
24+
25+
Value:
26+
The audioPan is a number between -100 and 100.
27+
By default, the audioPan property is 0.
28+
29+
Description:
30+
Use the audioPan property to pan audio from either the left or right channel to the other.
31+
Negative values move audio from the right channel to the left.
32+
Positive values move audio from the left channel to the right.
33+
Setting the audioPan back to 0 will disable panning.
34+
35+
>**Important:** This property only has an effect on media files that contain stereo audio tracks.
36+
> Mono audio tracks cannot currently be panned.
37+
38+
References: player (object), leftBalance (property), rightBalance (property)
39+
40+
Associations: player
41+
42+
Tags: multimedia
43+

‎docs/dictionary/property/leftBalance.lcdoc‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Name: leftBalance
2+
3+
Type: property
4+
5+
Syntax: set the leftBalance of <player> to <percentage>
6+
7+
Summary:
8+
Specifies the volume of the left stereo channel output of a player control.
9+
10+
Introduced: 9.0.1
11+
12+
OS: mac
13+
14+
Platforms: desktop
15+
16+
Example:
17+
set the leftBalance of player "myVideoPlayer" to 100 -- maximum loudness
18+
19+
Value:
20+
The leftBalance is a number between zero and 100.
21+
By default, the leftBalance property is 100.
22+
23+
Description:
24+
Use the leftBalance property to set the volume of audio played through the left speaker.
25+
26+
Setting the leftBalance to zero turns off audio to the left speaker.
27+
28+
>**Important:** This property only has an effect on media files that contain stereo audio tracks.
29+
> Mono audio tracks cannot currently be balanced.
30+
31+
References: player (object), rightBalance (property), audioPan (property)
32+
33+
Associations: player
34+
35+
Tags: multimedia
36+

‎docs/dictionary/property/playLoudness.lcdoc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ on the left side of the <player|player's> controller bar, which is
3838
visible if the <player|player's> <showController> property is true.
3939

4040
References: play (command), beep (command), recordLoudness (function),
41-
player (object), showController (property)
41+
player (object), showController (property),
42+
leftBalance (property), rightBalance (property), audioPan (property)
4243

4344
Tags: multimedia
4445

‎docs/dictionary/property/rightBalance.lcdoc‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Name: rightBalance
2+
3+
Type: property
4+
5+
Syntax: set the rightBalance of <player> to <percentage>
6+
7+
Summary:
8+
Specifies the volume of the right stereo channel output of a player control.
9+
10+
Introduced: 9.0.1
11+
12+
OS: mac
13+
14+
Platforms: desktop
15+
16+
Example:
17+
set the rightBalance of player "myVideoPlayer" to 100 -- maximum loudness
18+
19+
Value:
20+
The rightBalance is a number between zero and 100.
21+
By default, the rightBalance property is 100.
22+
23+
Description:
24+
Use the rightBalance property to set the volume of audio played through the right speaker.
25+
26+
Setting the rightBalance to zero turns off audio to the right speaker.
27+
28+
>**Important:** This property only has an effect on media files that contain stereo audio tracks.
29+
> Mono audio tracks cannot currently be balanced.
30+
31+
References: player (object), rightBalance (property), audioPan (property)
32+
33+
Associations: player
34+
35+
Tags: multimedia
36+

‎docs/notes/bugfix-16366.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure the area outside the stack rect is re-rendered when going to a new card in fullscreen mode showAll

‎docs/notes/bugfix-16736.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix crash when relayering objects with accelerated rendering true

0 commit comments

Comments
 (0)