Skip to content

Commit f03f079

Browse files
author
runrevali
committed
Merge remote-tracking branch 'upstream/develop' into refactor
Conflicts: engine/src/button.cpp engine/src/desktop.cpp engine/src/player-platform.cpp engine/src/player-platform.h engine/src/w32dcw32.cpp ide
2 parents 24d2067 + 001bb6f commit f03f079

Some content is hidden

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

58 files changed

+1141
-205
lines changed

‎builder/release_notes_builder.rev‎

1.29 KB
Binary file not shown.

‎docs/dictionary/command/revBrowserSet.xml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,19 +183,15 @@ stack</description>
183183

184184
<value>The <b>revBrowserSet</b> command puts empty into the result if
185185
successful. </value>
186-
<comments><note> The "advanced" callback messages are: <message
187-
tag="browserClick">browserClick</message>, <message
188-
tag="browserOut">browserOut</message> and <message
189-
tag="browserOver">browserOver</message>. These messages are only sent when
186+
<comments><note> The "advanced" callback messages are: <message tag="browserClick">browserClick</message>, <message tag="browserOut">browserOut</message> and <message tag="browserOver">browserOver</message>. These messages are only sent when
190187
the "messages" property is set to true. The other callback messages are
191188
always sent.<p></note><p></p><note> Setting the selected property selects
192189
the first instance of that text. Setting the property repeatedly to the same
193190
value will cycle through each occurrence of the value. Setting the selected
194191
to empty or to a string not present in the current document will reset the
195192
selected text, ie subsequently setting the selected to any string will
196193
select the first occurrence again. This behavior is similar to that of the
197-
<command tag="find">find
198-
command</command>.</note><p></p><p></p><change>There is a long standing
194+
<command tag="find">find command</command>.</note><p></p><p></p><change>There is a long standing
199195
issue with revBrowser that causes browser instances to be lost whenever the
200196
stack it is attached to has its window re-created. Previously, cases where
201197
this would occur had to be avoided when a browser was present on a
@@ -226,8 +222,7 @@ false</p><p>end browserDisableScrollbars</p><p></p><p>on
226222
browserToggleScrollbars</p><p> revBrowserSet sBrowserId, scrollbars,
227223
(not(revBrowserGet(sBrowserId, scrollbars)))</p><p>end
228224
browserToggleScrollbars</p><p></p><p></p><p></p><note> For general
229-
information on using the browser library, see the notes in the <function
230-
tag="revBrowserOpen">revBrowserOpen function</function>
225+
information on using the browser library, see the notes in the <function tag="revBrowserOpen">revBrowserOpen function</function>
231226
reference.</note><p>&#9;</p></comments>
232227
</description>
233228
</doc>

‎docs/dictionary/function/revBrowserOpenCef.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,9 @@ into tFile</p><p> put revBrowserOpenCef(the windowId of this stack,
6060
command</command>
6161
<command tag="revBrowserSet">revBrowserSet command</command>
6262
<command tag="revBrowserClose">revBrowserClose command</command>
63-
<command
64-
tag="revBrowserAddJavaScriptHandler">revBrowserAddJavaScriptHandler
63+
<command tag="revBrowserAddJavaScriptHandler">revBrowserAddJavaScriptHandler
6564
command</command>
66-
<command
67-
tag="revBrowserRemoveJavaScriptHandler">revBrowserRemoveJavaScriptHandler
65+
<command tag="revBrowserRemoveJavaScriptHandler">revBrowserRemoveJavaScriptHandler
6866
command</command>
6967
<message tag="browserOver">browserOver message</message>
7068
<message tag="browserNewInstance">browserNewInstance message</message>

‎docs/dictionary/property/loadedTime.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>loadedTime</name> <type>property</type> <syntax> <example>get the loadedTime of player<i> </i>"myPlayer"</example> </syntax> <synonyms> </synonyms> <summary>Specifies the time of a sound/movie, up to which the sound/movie can be played. </summary> <examples><example>put trunc(the loadedTime of me / the duration of me * 100) into tPercentLoaded</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>Multimedia</category> </classification> <references> <property tag="looping">looping Property</property> <property tag="callbacks">callbacks Property</property> <property tag="startTime">startTime Property</property> <property tag="endTime">endTime Property</property> <property tag="showSelection">showSelection Property</property> </references> <description>Use the <b>loadedTime</b> <glossary tag="property">property</glossary> to find out up to which time a movie or sound can be played.<p></p><p><b>Value:</b></p><p>The <b>loadedTime</b> of a <keyword tag="player">player</keyword> is an integer.</p><p></p><p>This property is read-only and cannot be set. </p><p></p><p>This property is used only for remote multimedia files. For local multimedia files, the value of this property is 0.</p></description></doc>

‎docs/notes/bugfix-10703.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# import snapshot from object is broken

‎docs/notes/bugfix-12830.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [[Player]] Movie not updated instantly when using QT player and alwaysBuffer is true

‎docs/notes/bugfix-13006.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [[Player]] Make controller scrollbar slightly wider

‎docs/notes/bugfix-13048.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Touch on Movie does not work

‎docs/notes/bugfix-13092.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [[ Player ]] Status property requested for player object

‎docs/notes/bugfix-13119.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [[Player]] new controller does not have playRate scrollbar control

0 commit comments

Comments
 (0)