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

Commit 5885a44

Browse files
author
runrevali
committed
Merge remote-tracking branch 'upstream/develop' into refactor-syntax_6_7_dp_8_merge
Conflicts: engine/engine.xcodeproj/project.pbxproj engine/src/aclip.cpp engine/src/answer.cpp engine/src/field.cpp engine/src/field.h engine/src/fieldf.cpp engine/src/funcs.cpp engine/src/globals.cpp engine/src/mac-av-player.mm engine/src/mode.h engine/src/object.cpp engine/src/osxfiles.cpp engine/src/property.cpp engine/src/quicktime.cpp engine/src/util.cpp ide prebuilt thirdparty version
2 parents def7c38 + 80ae30b commit 5885a44

File tree

105 files changed

+3335
-782
lines changed

Some content is hidden

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

105 files changed

+3335
-782
lines changed
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<doc>
2+
<legacy_id></legacy_id>
3+
<name>record pause</name>
4+
<type>command</type>
5+
6+
<syntax>
7+
<example>record pause</example>
8+
</syntax>
9+
10+
<synonyms>
11+
</synonyms>
12+
13+
<summary>Pauses the current sound recording.</summary>
14+
15+
<examples>
16+
<example><p>if the hilite of button "pause" then</p><p> record pause</p><p>end if</p></example>
17+
</examples>
18+
19+
<history>
20+
<introduced version="6.7">Added.</introduced>
21+
<deprecated version=""></deprecated>
22+
<removed version=""></removed>
23+
24+
<experimental version=""></experimental>
25+
<nonexperimental version=""></nonexperimental>
26+
</history>
27+
28+
<objects>
29+
</objects>
30+
31+
<platforms>
32+
<mac/>
33+
<windows/>
34+
</platforms>
35+
36+
<classes>
37+
<desktop/>
38+
<server/>
39+
<web/>
40+
</classes>
41+
42+
<security>
43+
</security>
44+
45+
46+
<classification>
47+
<category>Images &amp; Multimedia</category>
48+
</classification>
49+
50+
<references>
51+
<command tag="record sound">record sound command</command>
52+
<command tag="stop recording">stop recording command</command>
53+
<command tag="record resume">record resume command</command>
54+
<property tag="recording">recording property</property>
55+
</references>
56+
57+
<description>
58+
<overview>Use the <b>record pause</b> command to pause a recording being made. </overview>
59+
60+
<parameters>
61+
</parameters>
62+
63+
<value></value>
64+
<comments>The <b>record pause</b> command pauses a recording started with the <command tag="record sound">record sound</command> command.<p></p><p>The <property tag="recording">recording</property> property remains true while a recording is paused.</p></comments>
65+
</description>
66+
</doc>
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<doc>
2+
<legacy_id></legacy_id>
3+
<name>record resume</name>
4+
<type>command</type>
5+
6+
<syntax>
7+
<example>record resume</example>
8+
</syntax>
9+
10+
<synonyms>
11+
</synonyms>
12+
13+
<summary>Resumes the pasued sound recording.</summary>
14+
15+
<examples>
16+
<example><p>if the hilite of button "pause" is false then</p><p> record resume</p><p>end if</p></example>
17+
</examples>
18+
19+
<history>
20+
<introduced version="6.7">Added.</introduced>
21+
<deprecated version=""></deprecated>
22+
<removed version=""></removed>
23+
24+
<experimental version=""></experimental>
25+
<nonexperimental version=""></nonexperimental>
26+
</history>
27+
28+
<objects>
29+
</objects>
30+
31+
<platforms>
32+
<mac/>
33+
<windows/>
34+
</platforms>
35+
36+
<classes>
37+
<desktop/>
38+
<server/>
39+
<web/>
40+
</classes>
41+
42+
<security>
43+
</security>
44+
45+
46+
<classification>
47+
<category>Images &amp; Multimedia</category>
48+
</classification>
49+
50+
<references>
51+
<command tag="record sound">record sound command</command>
52+
<command tag="record pause">record pause command</command>
53+
<command tag="stop recording">stop recording command</command>
54+
<property tag="recording">recording property</property>
55+
</references>
56+
57+
<description>
58+
<overview>Use the <b>record resume</b> command to resume a recording that has been paused.</overview>
59+
60+
<parameters>
61+
</parameters>
62+
63+
<value></value>
64+
<comments>The <b>record resume</b> command resumes a recording paused with the <command tag="record pause">record pause</command> command.</comments>
65+
</description>
66+
</doc>
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<doc>
2+
<legacy_id></legacy_id>
3+
<name>editionType</name>
4+
<type>property</type>
5+
6+
<syntax>
7+
<example>get the editionType</example>
8+
</syntax>
9+
10+
<synonyms>
11+
</synonyms>
12+
13+
<summary>Returns the edition type of the running engine.</summary>
14+
15+
<examples>
16+
<example><p>if the edtionType is "community" then</p><p> displayMessage
17+
"Built with LiveCode Community"</p><p>end if</p></example>
18+
</examples>
19+
20+
<history>
21+
<introduced version="6.7">Added.</introduced>
22+
<deprecated version=""></deprecated>
23+
<removed version=""></removed>
24+
<changed version=""></changed>
25+
<experimental version=""></experimental>
26+
<nonexperimental version=""></nonexperimental>
27+
</history>
28+
29+
<objects>
30+
<global/>
31+
</objects>
32+
33+
<platforms>
34+
<mac/>
35+
<windows/>
36+
<linux/>
37+
<ios/>
38+
<android/>
39+
</platforms>
40+
41+
<classes>
42+
<desktop/>
43+
<server/>
44+
<web/>
45+
<mobile/>
46+
</classes>
47+
48+
<security>
49+
</security>
50+
51+
52+
<classification>
53+
</classification>
54+
55+
<references>
56+
<function tag="revLicenseType">revLicenseType function</function>
57+
<function tag="version">version function</function>
58+
</references>
59+
60+
<description>
61+
<overview>Use the <b>editionType</b> global property to determine what
62+
edition of the engine is currently running.</overview>
63+
64+
<parameters>
65+
</parameters>
66+
67+
<value>The <b>editionType </b>property returns community or
68+
commercial.<p></p><p>This property is read-only and cannot be
69+
set.</p></value>
70+
<comments>The global property the<b> editionType</b> can be used to
71+
determine what edition of the engine is currently running.<p></p><p>The
72+
<b>editionType </b>returns "community" if the currently running engine is
73+
the LiveCode Community IDE or a standalone built with LiveCode
74+
Community.</p><p></p><p>The <b>editionType </b>returns "commercial" if the
75+
currently running engine is the LiveCode Commercial IDE or a standalone
76+
built with LiveCode Commercial.</p></comments>
77+
</description>
78+
</doc>

docs/notes/bugfix-12372.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Toggle usePixelScale property

docs/notes/bugfix-12798.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# libURL doesn't report actual redirect error

docs/notes/bugfix-12885.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Sound recording returns error message
2+
3+
The Quicktime implementation of sound recording has been updated to use the SGAudioMediaType in place of the deprecated SoundMediaType, to fix various errors with sound recording. Moreover a pausing feature has been added to the sound recorder, via the syntax **record pause** and **record resume**.

docs/notes/bugfix-12966.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# revVideoGrabber - revVideoGrabDialog "audio" does not bring up dialog

docs/notes/bugfix-13016.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Erratic behavior whilst moving a window along with excessive WindowServer CPU usage.

docs/notes/bugfix-13063.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [[Player]] selection by shift + click Play button delayed start and stop.

docs/notes/bugfix-13064.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [[Player]] playSelection not working correctly

0 commit comments

Comments
 (0)