820 Commits

Author SHA1 Message Date
Stéphane Lepin
cba2bf5cb8 ci(macos): fix obs build issue 2019-05-02 13:16:39 +02:00
Stéphane Lepin
d8b37328a1 ConnProperties: atomic "authenticated" field 2019-05-02 13:11:34 +02:00
Stéphane Lepin
bb9cf83744 server: dedicated ConnectionProperties object 2019-05-02 13:06:10 +02:00
Stéphane Lepin
56fc6ae47c server: connection properties reference 2019-05-02 12:51:07 +02:00
Stéphane L
0cf17cf3db server: use shared connection properties instance 2019-04-28 11:59:03 +02:00
Stéphane Lepin
1bd3297055 server: update comment 2019-04-26 13:55:21 +02:00
Stéphane Lepin
6a10662bc4 server: use a thread pool 2019-04-26 13:52:56 +02:00
Stéphane Lepin
2d84ad8963 server: handle requests in a separate thread 2019-04-26 13:39:18 +02:00
Travis CI
1ec69cbc0d docs(travis): Update protocol.md - 0057744 [skip ci] 2019-04-25 12:35:06 +00:00
Stéphane Lepin
0057744e57 Merge branch '4.x-current' of github.com:Palakis/obs-websocket into 4.x-current 2019-04-25 14:33:53 +02:00
Stéphane Lepin
45892b4347 events: fix docs 2019-04-25 14:02:04 +02:00
Travis CI
3d41e8882a docs(travis): Update protocol.md - 436b821 [skip ci] 2019-04-25 11:44:54 +00:00
Stéphane Lepin
436b8216ec requests(streaming): add @since property for SendCaptions 2019-04-25 13:43:24 +02:00
Stéphane L
03ba2a680e SetSceneItemProperties: fix string comparison for bounds type parameter
Fixes #309
2019-04-23 11:32:04 +02:00
Travis CI
2821962d12 docs(travis): Update protocol.md - 43d38a2 [skip ci] 2019-04-22 17:57:20 +00:00
Stéphane Lepin
43d38a2e63
Merge pull request #308 from Palakis/bugfix/285-item-id
Provide scene item id in events data and request responses
2019-04-22 19:56:08 +02:00
Stéphane L
ea28d217e0 requests: add "id" to scene item data and fix docs 2019-04-22 19:45:32 +02:00
Stéphane L
89fe6d57c9 events: add "item-id" property to scene item events 2019-04-22 19:34:27 +02:00
Travis CI
1d0e1143bf docs(travis): Update protocol.md - 1a99353 [skip ci] 2019-04-22 17:00:15 +00:00
Stéphane Lepin
1a99353559
Merge pull request #307 from Palakis/feature/271-item-selected
Item Select/Deselect events
2019-04-22 18:58:50 +02:00
Stéphane L
ad97d04e37 events: scene item select and deselect events 2019-04-22 18:47:46 +02:00
Travis CI
25c3abe873 docs(travis): Update protocol.md - 8eeea50 [skip ci] 2019-04-22 16:32:39 +00:00
Stéphane Lepin
8eeea50ede
Merge pull request #305 from Rosuav/fix-docs-formatting
Fix docs formatting (loose combining character)
2019-04-22 18:31:16 +02:00
Stéphane Lepin
0ded11c6a2
Merge pull request #306 from Rosuav/set-scene-item-locked
Allow the manipulation of the locked flag of scene items.
2019-04-22 18:30:20 +02:00
Stéphane L
b6c542212d events: fix typo 2019-04-22 18:29:59 +02:00
Chris Angelico
182bde4884 Allow the manipulation of the locked flag of scene items.
Lockedness can be seen when you query an item or see the scene
contents, and can be changed (only) with SetSceneItemProperties.
2019-04-23 00:32:28 +10:00
Stéphane Lepin
eb84f677cf
Merge pull request #304 from Palakis/feature/269-settings-per-profile
Move settings to profile
2019-04-22 16:29:01 +02:00
Chris Angelico
3ecb637e70 Fix docs formatting (loose combining character) 2019-04-23 00:23:06 +10:00
Stéphane L
bfc826b898 config: fix types 2019-04-22 16:18:54 +02:00
Stéphane L
efc6d4c15a config: enable settings migration 2019-04-22 16:13:12 +02:00
Stéphane L
a96da35f11 server: don't notify disconnections when stopping the server 2019-04-22 16:03:53 +02:00
Stéphane L
2bff3798af config: slight change 2019-04-22 15:46:59 +02:00
Stéphane L
0fb50a3273 config: put alerts text to locale data 2019-04-22 15:43:41 +02:00
Stéphane L
1c17eee125 config(profile change): fix notifications 2019-04-22 15:26:26 +02:00
Stéphane L
14a43a9cd2 server: call reset before starting (fixes restarts) 2019-04-22 15:06:36 +02:00
Stéphane L
7bbc7366f2 server: allow address reuse 2019-04-22 13:33:39 +02:00
Stéphane L
879bedd781 server(stop): close all connections and wait for proper stop 2019-04-22 13:29:53 +02:00
Stéphane L
8b79bfab4f config: set default before reloading from profile 2019-04-22 13:12:01 +02:00
Stéphane L
f022e09938 config: show message if server is stopped after profile change 2019-04-21 18:59:04 +02:00
Stéphane L
a63b6a0e3d config: per profile settings 2019-04-21 18:52:47 +02:00
Travis CI
dd1facec06 docs(travis): Update protocol.md - a46b571 [skip ci] 2019-04-21 15:44:12 +00:00
Stéphane Lepin
a46b5716be
Merge pull request #303 from Palakis/feature/115-streamstatus-more-info
Add more stats to StreamStatus and Heartbeat + add GetStats request type
2019-04-21 17:42:36 +02:00
Stéphane L
e96b7bfd62 fix docs 2019-04-21 16:03:44 +02:00
Stéphane L
a60c1c1365 stats: provide recording disk space 2019-04-21 16:03:05 +02:00
Stéphane L
4c39fcd614 events(GetStats): missing field 2019-04-21 15:49:08 +02:00
Stéphane L
e6b341f2a0 requests: add GetStats 2019-04-21 15:44:24 +02:00
Stéphane L
bdf9e76a6b events: more stats info in StreamStatus and Heartbeat 2019-04-21 15:38:27 +02:00
Stéphane L
e0fc395fbe events: remove unused variable 2019-04-21 14:48:15 +02:00
Travis CI
107c03653d docs(travis): Update protocol.md - a5058cf [skip ci] 2019-04-21 12:27:27 +00:00
Stéphane Lepin
a5058cf951
Merge pull request #302 from Palakis/bugfix/168-sourceorderchanged-items-list
event(SourceOrderChanged): include scene items list
2019-04-21 14:26:25 +02:00