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

Commit 8426332

Browse files
author
Monte Goulding
committed
Merge commit '5d8191080670382aae3e19783d5cad3e70294ef9' into legacy-exec
# Conflicts: # engine/src/cmdsc.cpp # engine/src/player-platform.cpp
2 parents de68b5f + 5d81910 commit 8426332

38 files changed

+697
-112
lines changed

config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ WIN_PERL=${WIN_PERL:-"C:/perl/bin/perl.exe"}
275275
# Android default settings and tools
276276
if test "${OS}" = "android" ; then
277277
ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-r10d}
278-
ANDROID_PLATFORM=${ANDROID_PLATFORM:-android-10}
278+
ANDROID_PLATFORM=${ANDROID_PLATFORM:-android-17}
279279

280280
# Attempt to locate an Android NDK
281281
if [ -z "${ANDROID_NDK}" -a "${OS}" = "android" ] ; then

docs/dictionary/command/revert.lcdoc

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ Name: revert
22

33
Type: command
44

5-
Syntax: revert
5+
Syntax: revert [<targetStack>]
66

7-
Summary: Restores the <current stack> to its state when last saved, deleting all changes made since the last save.
7+
Summary: Restores a stack to its state when last saved, deleting all
8+
changes made since the last save.
89

910
Introduced: 1.0
1011

@@ -16,13 +17,28 @@ Example:
1617
revert
1718

1819
Example:
19-
if it is "Don't Save" then revert
20+
revert stack "MyStack"
2021

21-
Description:
22-
Use the <revert> <command> to back out of any changes made to the <current stack> since the last save.
22+
Parameters:
2323

24-
The <revert> <command> also <undo|undoes> changes made to other <stacks> stored in the same <stack file>. That is, if you <revert> a <main stack>, all <substacks> of that <stack> also revert to the last save, and if you revert a <substack>, its <main stack> and any other <substacks> also revert.
24+
targetStack: An optional stack reference.
2525

26-
References: substacks (property), mainStack (property), revRollBackDatabase (command), reset paint (command), revdb_rollback (function), stacks (function), substack (glossary), stack file (glossary), current stack (glossary), command (glossary), undo (glossary), main stack (glossary), stack (object)
26+
Description:
27+
Use the <revert> <command> to back out of any changes made to a stack
28+
since the last save.
29+
30+
If no <targetStack> is specified, the <revert> command acts on the
31+
<current stack>.
32+
33+
The <revert> <command> also <undo|undoes> changes made to other <stacks>
34+
stored in the same <stack file>. That is, if you <revert> a <main stack>,
35+
all <substacks> of that <stack> also revert to the last save, and if you
36+
revert a <substack>, its <main stack> and any other <substacks> also
37+
revert.
38+
39+
References: substacks (property), mainStack (property),
40+
stacks (function), substack (glossary),
41+
stack file (glossary), current stack (glossary), command (glossary),
42+
undo (glossary), main stack (glossary), stack (object)
2743

2844
Tags: file system

docs/dictionary/function/codepointProperty.lcdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Name: codepointProperty
22

33
Type: function
44

5-
Syntax: codepointToNum(<unicodeCodepoint>, <propertyName>)
5+
Syntax: codepointProperty(<unicodeCodepoint>, <propertyName>)
66

77
Summary: Retrieves a Unicode Character Database (UCD )character property of a Unicode codepoint.
88

docs/dictionary/message/textChanged.lcdoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ on textChanged -- enable the save button when a change is made
1919
enable button "save"
2020
end textChanged
2121

22+
Example:
23+
on textChanged -- resize height of field to fit text
24+
lock screen -- lock screen to delay the screen update so that there is no flicker
25+
put the rect of me into tRect
26+
put item 2 of tRect + the formattedHeight of me into item 4 of tRect
27+
set the rect of me to tRect
28+
end textChanged
29+
2230
Description:
2331
Is dispatched by the field whenever a user (or simulated user) action causes the content of the field to change.
2432

docs/dictionary/property/mediaTypes.lcdoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ Type: property
44

55
Syntax: get the mediaTypes of <player>
66

7-
Summary: Specifies one or more types of media used in in a <QuickTime> movie.
7+
Summary: Specifies one or more types of media used in a movie.
88

99
Associations: player
1010

1111
Introduced: 1.0
1212

13-
OS: mac,linux,ios,android
13+
OS: mac,windows
1414

15-
Platforms: desktop,server,web,mobile
15+
Platforms: desktop
1616

1717
Example:
1818
if the mediaTypes of player 1 contains "audio" then increaseLoudness
@@ -28,15 +28,15 @@ Value (set):
2828
This property is read:only and cannot be set
2929

3030
Description:
31-
Use the <mediaTypes> <property> to find out what kinds of media a <QuickTime> movie contains.
31+
Use the <mediaTypes> <property> to find out what kinds of media a movie contains.
3232

33-
Most QuickTime movies provide more than one media type. For example, a typical movie might provide one video and one audio track.
33+
Most movies provide more than one media type. For example, a typical movie might provide one video and one audio track.
3434

3535
If more than one track in the movie uses the same media type, the media type is specified only once in the <mediaTypes> property. For example, "audio" appears only once in the <mediaTypes>, even if the movie contains more than one audio track.
3636

3737
Changes:
38-
This property was removed from the Windows platform in version 8.1.0, due to the change of player implementation from QuickTime to DirectShow.
38+
This document was updated in version 8.1.0 to remove references to QuickTime, as this property is now also supported by the Windows DirectShow-based player.
3939

40-
References: trackCount (property), QuickTime (glossary), property (glossary)
40+
References: trackCount (property), property (glossary)
4141

4242
Tags: multimedia

docs/lcb/notes/16212.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# LiveCode Builder Tools
2+
## lc-compile
3+
4+
# [16212] Escape XML reserved characters in manifest files

docs/lcb/notes/17767.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# LiveCode Builder Tools
2+
## lc-compile
3+
4+
# [17767] Process escape sequences in all string literals.

docs/notes/bugfix-17661.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Improve Android timestamp accuracy for GPS and sensors
2+
3+
Timestamps for sensors on Android were previously passed in a low-precision
4+
format, resulting in "sticky" timestamps that did not change more than a few
5+
times a minute. This has now been resolved and timestamps are now reported to
6+
microsecond resolution (though the accuracy is unlikely to be at the microsecond
7+
level).
8+
9+
In addition to this change, the timestamps are now reported in "monotonic" time
10+
rather than "wall-clock" time ("wall-clock" time is the time you see reported
11+
as the current time). This means that the timestamps are now independent of
12+
changes to the device clock as a result of adjustments or daylight savings
13+
changes. If you want to match the readings to the device time instead, get the
14+
current time when receiving the location update rather than using the timestamp
15+
in the update.
16+

docs/notes/bugfix-17700.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix Windows player not pausing when in edit mode

docs/notes/bugfix-17731.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Prevent anomalies when revert used in html5 standalone building

0 commit comments

Comments
 (0)