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

Commit 700372d

Browse files
author
livecodeali
committed
Merge remote-tracking branch 'upstream/develop-7.0' into merge-develop_7.0_08_07_15
Conflicts: docs/dictionary/command/accept.xml docs/dictionary/command/close-socket.xml docs/dictionary/command/open-socket.xml docs/dictionary/command/read-from-socket.xml docs/dictionary/command/secure-socket.xml docs/dictionary/command/write-to-socket.xml docs/dictionary/function/openSockets.xml docs/dictionary/message/socketClosed.xml docs/dictionary/message/socketError.xml docs/dictionary/message/socketTimeout.xml docs/dictionary/property/socketTimeoutInterval.xml engine/src/dsklnx.cpp thirdparty
2 parents 5bd4ba8 + 0644136 commit 700372d

Some content is hidden

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

78 files changed

+2321
-829
lines changed

‎docs/dictionary/command/accept.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Summary: Accepts an internet connection and creates a <socket> for that connecti
88

99
Introduced: 1.0
1010

11-
OS: mac,windows,linux
11+
OS: mac,windows,linux,iOS,android
1212

13-
Platforms: desktop,server,web
13+
Platforms: desktop,server,web,mobile
1414

1515
Security: network
1616

‎docs/dictionary/command/close-socket.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Summary: Shuts down a connection that was opened with the <open socket> or <acce
88

99
Introduced: 1.0
1010

11-
OS: mac,windows,linux
11+
OS: mac,windows,linux,iOS,android
1212

13-
Platforms: desktop,server,web
13+
Platforms: desktop,server,web,mobile
1414

1515
Security: network
1616

‎docs/dictionary/command/open-socket.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Summary: Establishes a <TCP> communications <socket> between your system and ano
1212

1313
Introduced: 1.0
1414

15-
OS: mac,windows,linux
15+
OS: mac,windows,linux,iOS,android
1616

17-
Platforms: desktop,server,web
17+
Platforms: desktop,server,web,mobile
1818

1919
Security: network
2020

‎docs/dictionary/command/read-from-socket.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Summary: Accepts data from a <socket> and places the data in the <it> <variable>
88

99
Introduced: 1.0
1010

11-
OS: mac,windows,linux
11+
OS: mac,windows,linux,iOS,android
1212

13-
Platforms: desktop,server,web
13+
Platforms: desktop,server,web,mobile
1414

1515
Example:
1616
read from socket "www.example.net:80" -- reads next character

‎docs/dictionary/function/openSockets.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Summary: <return|Returns> a list of the currently open <socket|sockets>.
1010

1111
Introduced: 1.0
1212

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

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

1717
Security: network
1818

‎docs/dictionary/message/socketClosed.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Associations: stack,card,field,button,graphic,scrollbar,player,image
1010

1111
Introduced: 1.0
1212

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

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

1717
Example:
1818
on socketClosed theID -- close a progress window for the socket

‎docs/dictionary/message/socketError.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Associations: stack,card,field,button,graphic,scrollbar,player,image
1010

1111
Introduced: 1.0
1212

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

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

1717
Example:
1818
on socketError theID, theError

‎docs/dictionary/message/socketTimeout.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Associations: stack,card,field,button,graphic,scrollbar,player,image
1010

1111
Introduced: 1.0
1212

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

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

1717
Example:
1818
on socketTimeout theID

‎docs/dictionary/property/socketTimeoutInterval.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Summary: Specifies how long to wait for a <read from socket> or <write to socket
88

99
Introduced: 1.0
1010

11-
OS: mac,windows,linux
11+
OS: mac,windows,linux,iOS,android
1212

13-
Platforms: desktop,server,web
13+
Platforms: desktop,server,web,mobile
1414

1515
Example:
1616
set the socketTimeoutInterval to 100 -- one-tenth of a second

‎docs/notes/bugfix-13262.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# [[Player]] player object in hidden group still displays video image

0 commit comments

Comments
 (0)