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

Commit 567f904

Browse files
author
runrevali
committed
Merge remote-tracking branch 'upstream/develop-6.7' into develop-7.0
Conflicts: engine/src/desktop-menu.cpp engine/src/desktop.cpp engine/src/mac-menu.mm engine/src/paragraf.cpp engine/src/stacklst.cpp thirdparty
2 parents 92433a4 + 355bd66 commit 567f904

35 files changed

+660
-318
lines changed

‎docs/dictionary/object/audioClip.xml‎

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1 @@
1-
<doc>
2-
<legacy_id>1085</legacy_id>
3-
<name>audioClip</name>
4-
<type>object</type>
5-
<syntax>
6-
</syntax>
7-
<library></library>
8-
<objects>
9-
</objects>
10-
<synonyms>
11-
<synonym>ac</synonym>
12-
</synonyms>
13-
<classification>
14-
<category>Objects Messages</category>
15-
</classification>
16-
<references>
17-
<keyword tag="templateAudioClip">templateAudioClip Keyword</keyword>
18-
</references>
19-
<history>
20-
<introduced version="1.0">Added.</introduced>
21-
</history>
22-
<platforms>
23-
<mac/>
24-
<windows/>
25-
<linux/>
26-
</platforms>
27-
<classes>
28-
<desktop/>
29-
<server/>
30-
<web/>
31-
</classes>
32-
<security>
33-
</security>
34-
<summary>An <glossary tag="object type">object type</glossary> that contains sound data.</summary>
35-
<examples>
36-
<example>play pause audioClip theCurrentSoundtrack</example>
37-
</examples>
38-
<description>
39-
<p>Use the <b>audioClip</b> <glossary tag="object type">object type</glossary> to play a sound that is stored in the <object tag="stack">stack</object>, rather than in another file.</p><p/><p><b>Comments:</b></p><p>Unlike a player, an audio clip contains the sound that it plays. This increases the memory required by your stack, because the sound data is loaded into memory along with the rest of the stack whenever the stack file is open. However, it prevents the sound from being accidentally separated from the stack file and lost.</p><p>Audio clips can be in WAV, AIFF, or AU format</p><p/><p>An audio clip is contained in a stack. Audio clips cannot contain other objects. (An audio clip is not a control, since it has no user interface and cannot be owned by a <keyword tag="card">card</keyword>.)</p>
40-
</description>
41-
</doc>
1+
<doc> <legacy_id>1085</legacy_id> <name>audioClip</name> <type>object</type> <syntax> </syntax> <synonyms> <synonym>ac</synonym> </synonyms> <summary>An <glossary tag="object type">object type</glossary> that contains sound data.</summary> <examples><example>play audioClip theCurrentSoundtrack</example> </examples> <history> <introduced version="1.0">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <mac/> <windows/> <linux/> </platforms> <classes> <desktop/> <server/> <web/> </classes> <security> </security> <classification> <category>Objects Messages</category> </classification> <references> <keyword tag="templateAudioClip">templateAudioClip keyword</keyword> </references> <description>Use the <b>audioClip</b> <glossary tag="object type">object type</glossary> to play a sound that is stored in the <object tag="stack">stack</object>, rather than in another file.<p></p><p><b>Comments:</b></p><p>Unlike a player, an audio clip contains the sound that it plays. This increases the memory required by your stack, because the sound data is loaded into memory along with the rest of the stack whenever the stack file is open. However, it prevents the sound from being accidentally separated from the stack file and lost.</p><p>Audio clips can be in WAV, AIFF, or AU format</p><p></p><p>An audio clip is contained in a stack. Audio clips cannot contain other objects. (An audio clip is not a control, since it has no user interface and cannot be owned by a <keyword tag="card">card</keyword>.)</p><p></p><p>To play an audioClip, use the syntax "play audioClip &lt;filename_of_audioclip&gt;".</p><p>To stop an audioClip, use the syntax "play stop".</p></description></doc>

‎docs/dictionary/object/videoClip.xml‎

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1 @@
1-
<doc>
2-
<legacy_id>1198</legacy_id>
3-
<name>videoClip</name>
4-
<type>object</type>
5-
<syntax>
6-
</syntax>
7-
<library></library>
8-
<objects>
9-
</objects>
10-
<synonyms>
11-
<synonym>vc</synonym>
12-
</synonyms>
13-
<classification>
14-
<category>Objects Messages</category>
15-
</classification>
16-
<references>
17-
<keyword tag="templateVideoClip">templateVideoClip Keyword</keyword>
18-
<property tag="videoClipPlayer">videoClipPlayer Property</property>
19-
</references>
20-
<history>
21-
<introduced version="1.0">Added.</introduced>
22-
</history>
23-
<platforms>
24-
<mac/>
25-
<windows/>
26-
<linux/>
27-
</platforms>
28-
<classes>
29-
<desktop/>
30-
<server/>
31-
<web/>
32-
</classes>
33-
<security>
34-
</security>
35-
<summary>An <glossary tag="object type">object type</glossary> that contains movie data.</summary>
36-
<examples>
37-
<example>play videoClip "Spartacus"</example>
38-
<example>delete videoClip ID 2485</example>
39-
</examples>
40-
<description>
41-
<p>Use the <b>videoClip</b> <glossary tag="object type">object type</glossary> to display a movie that is stored in the <object tag="stack">stack</object>, rather than in another file.</p><p/><p><b>Comments:</b></p><p>Unlike a player, a video clip contains the movie that it displays. This increases the memory required by your stack, because the movie data is loaded into memory whenever the stack file is open. However, it prevents the movie from being accidentally separated from the stack file and lost.</p><p/><p>Video clips can be in QuickTime, AVI, or MPEG format.</p><p/><p>A video clip is contained in a stack. Video clips cannot contain other objects. (A video clip is not a control, since it has no user interface and cannot be owned by a card.)</p><p/>
42-
</description>
43-
</doc>
1+
<doc> <legacy_id>1198</legacy_id> <name>videoClip</name> <type>object</type> <syntax> </syntax> <synonyms> <synonym>vc</synonym> </synonyms> <summary>An <glossary tag="object type">object type</glossary> that contains movie data.</summary> <examples><example>play videoClip "Spartacus"</example><example>delete videoClip ID 2485</example> </examples> <history> <introduced version="1.0">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <mac/> <windows/> <linux/> </platforms> <classes> <desktop/> <server/> <web/> </classes> <security> </security> <classification> <category>Objects Messages</category> </classification> <references> <property tag="videoClipPlayer">videoClipPlayer property</property> <keyword tag="templateVideoClip">templateVideoClip keyword</keyword> </references> <description>Use the <b>videoClip</b> <glossary tag="object type">object type</glossary> to display a movie that is stored in the <object tag="stack">stack</object>, rather than in another file.<p></p><p><b>Comments:</b></p><p>Unlike a player, a video clip contains the movie that it displays. This increases the memory required by your stack, because the movie data is loaded into memory whenever the stack file is open. However, it prevents the movie from being accidentally separated from the stack file and lost.</p><p></p><p>Video clips can be in QuickTime, AVI, or MPEG format.</p><p></p><p>A video clip is contained in a stack. Video clips cannot contain other objects. (A video clip is not a control, since it has no user interface and cannot be owned by a card.)</p><p></p><p>To play a videoClip, use the syntax "play videoClip &lt;filename_of_videoclip&gt;".</p><p>To pause a videoClip, use the syntax "play pause videoClip &lt;filename_of_videoclip&gt;".</p><p>To stop a videoClip, use the syntax "play stop videoClip &lt;filename_of_videoclip&gt;".</p></description></doc>

‎docs/dictionary/property/status.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<doc> <legacy_id></legacy_id> <name>status</name> <type>property</type> <syntax> <example>put the status of player<i> </i>"myPlayer" into tStatus</example> </syntax> <synonyms> </synonyms> <summary>Specifies the current status of a player object </summary> <examples><example><p>put the status of player "myPlayer" into tStatus</p><p>if tStatus is "loading" then</p><p> put "Loading" &amp;&amp; CR after fld "myField"</p><p>else if tStatus is "playing" then </p><p> put "Playing" &amp;&amp; CR after fld "myField"</p><p>else</p><p> put "Paused" &amp;&amp; CR after fld "myField"</p><p>end if</p><p></p><p></p></example> </examples> <history> <introduced version="6.7">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> <player/> </objects> <platforms> <mac/> </platforms> <classes> <desktop/> </classes> <security> </security> <classification> <category>Images &amp; Multimedia</category> </classification> <references> <property tag="looping">looping property</property> <property tag="callbacks">callbacks property</property> <property tag="startTime">startTime property</property> <property tag="showSelection">showSelection property</property> <property tag="duration">duration property</property> </references> <description>Use the <b>status</b> <glossary tag="property">property</glossary> to find out the current status of a player object.<p></p><p><b>Value:</b></p><p>The <b>status</b> of a <keyword tag="player">player</keyword> is a string that can take any of the following values:</p><p>- <i><b>loading </b>(for remote multimedia files only)</i></p><p><i>- <b>playing</b></i></p><p><i>- <b>paused</b></i></p><p></p><p>This property is read-only and cannot be set.</p></description></doc>

‎docs/notes/bugfix-13628.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Fix the colour picker on OSX Yosemite
2+

‎docs/notes/bugfix-13666.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# command "play stop" does not work

‎docs/notes/bugfix-13832.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Script Editor auto-indenting no longer works as in previous versions

‎docs/notes/bugfix-13836.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Unable to uncomment lines of code via keyboard shortcut in OSX

‎docs/notes/bugfix-13849.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# arrowKeys trigger mouse down in menu bar

‎docs/notes/bugfix-13881.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Corrupted stack file crashes LiveCode

‎docs/notes/bugfix-13882.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Images with resizeQuality set to "good" are rendered oddly depending on coordinates

0 commit comments

Comments
 (0)