Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
995 Commits 6 Branches 45 Tags
Commit Graph

995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stéphane Lepin
bfd26493ab Utils(GetTransitionDuration): return 0 if transition is a cut transition 2019-08-30 13:41:08 +02:00
Stéphane Lepin
5d74d5d03e WSEvents(OnTransitionBegin): refactor event code 2019-08-30 13:36:45 +02:00
Stéphane Lepin
3142e097a5
Merge pull request #360 from ZyanKLee/patch-1 
allow for "linuxbrowser_source" to be controlled
 2019-08-26 21:02:00 +02:00
Stéphane Lepin
b25d8d8201 requests(sources): fix linux browser source id 2019-08-26 21:01:05 +02:00
Stéphane Lepin
7e68cd016a ci(windows): exclude RCs when fetching the latest version of OBS 2019-08-24 12:39:46 +02:00
ZyanKLee
9e4fc9eb73
allow for "linuxbrowser_source" to be controlled 
based on the request at https://github.com/bazukas/obs-linuxbrowser/issues/46 I did a quick search for the string "browser_source" and these seem to be the only two occurrences. Enhancing the conditional with the identifier of the obs-linuxbrowser plugin, this should solve the problem.

As I'm currently not at home, I can't verify this does what it should, but I will test it later tonight.

@mjc666 if you are still interested please give it a test run to verify if these two plugins work together now.
 2019-08-22 19:44:12 +02:00
Stéphane Lepin
fb0d13a171 WSRequestHandler: add int and double type check methods 2019-08-02 21:52:50 +02:00
Stéphane Lepin
f097b36c2e WSRequestHandler: add type checks for field test methods 2019-08-02 21:40:42 +02:00
Stéphane Lepin
57ce3cf80b
Merge pull request #320 from Palakis/feature/remove-hacks 
utils: remove transition hacks
 2019-07-31 17:38:40 +02:00
Travis CI
c1da62391f docs(travis): Update protocol.md - d8882ce [skip ci] 2019-07-31 15:37:41 +00:00
Stéphane Lepin
d8882ce979
Merge pull request #357 from julijane/fix-001 
Fix spec of HandleBroadcastCustomMessage
 2019-07-31 17:36:39 +02:00
Juliane Holzt
9c1871494e
Fix spec of HandleBroadcastCustomMessage 2019-07-26 14:40:54 +02:00
Travis CI
ac26c9114a docs(travis): Update protocol.md - fb0a570 [skip ci] 2019-07-26 07:31:42 +00:00
Stéphane Lepin
fb0a57003c BroadcastCustomMessage: fix command and event spec 2019-07-26 09:30:30 +02:00
Travis CI
cda22233a6 docs(travis): Update protocol.md - add3075 [skip ci] 2019-07-26 03:52:35 +00:00
Stéphane Lepin
add307577d
Merge pull request #354 from julijane/4.x-current 
Make it possible to broadcast messages (data) to other websocket clients
 2019-07-26 05:51:42 +02:00
Juliane Holzt
4af46ac2b9
use obs_data_t* in Event function 2019-07-25 17:20:31 +02:00
Juliane Holzt
8d39752bda
Move event emitting code 2019-07-25 17:00:32 +02:00
Juliane Holzt
e3ff9c013e
change function name, language 2019-07-25 14:47:47 +02:00
Juliane Holzt
635870ba4b
more comment fixes 2019-07-24 05:36:47 +02:00
Juliane Holzt
a827afb05b
Comment fix 2019-07-24 01:56:53 +02:00
Juliane Holzt
0195e13bdc
Implement proposed changes to Broadcast 2019-07-23 21:47:55 +02:00
Juliane Holzt
76d8b688fd
Add Code for BroadcastWebSocketMessage 2019-07-22 01:05:21 +02:00
Travis CI
b4857e2c79 docs(travis): Update protocol.md - ac2ae90 [skip ci] 2019-07-16 16:23:36 +00:00
Stéphane Lepin
ac2ae90e8a
Merge pull request #343 from Palakis/feature/outputs-api 
Outputs API
 2019-07-16 18:22:40 +02:00
Stéphane Lepin
0b5cb76b5d outputs: remove TODOs 2019-07-16 18:22:07 +02:00
Stéphane Lepin
6eed9606ae
docs: remove Boost from BUILDING.md 2019-06-23 22:38:36 +02:00
Travis CI
29679ff94c docs(travis): Update protocol.md - 65a1f8b [skip ci] 2019-06-18 16:41:13 +00:00
Stéphane Lepin
65a1f8b746
GetSourceTypesList: fix docs 
Fixes #348
 2019-06-18 18:38:52 +02:00
Travis CI
48182d35bd docs(travis): Update protocol.md - b526ed4 [skip ci] 2019-06-16 14:20:37 +00:00
Stéphane Lepin
b526ed47be Merge branch '4.x-current' of github.com:Palakis/obs-websocket into 4.x-current 2019-06-16 16:19:32 +02:00
Stéphane Lepin
2225dec2a9 docs(SourceAudioMixersChanged): fix remaining discrepancy 2019-06-16 16:19:22 +02:00
Travis CI
011458d642 docs(travis): Update protocol.md - e32fff3 [skip ci] 2019-06-16 14:18:12 +00:00
Stéphane Lepin
e32fff3f61 docs(SourceAudioMixersChanged): fix discrepancy 2019-06-16 16:14:26 +02:00
Stéphane Lepin
0b42e3d0f3 outputs: add more info fields 2019-06-11 19:32:52 +02:00
Stéphane Lepin
2b746d1353 cmake: add output requests 2019-06-11 19:32:52 +02:00
Stéphane Lepin
6fed6f9f7d StartOutput: provide output error message when start fails 2019-06-11 19:32:52 +02:00
Stéphane Lepin
480945073a outputs: start or stop only when possible 2019-06-11 19:32:52 +02:00
Stéphane Lepin
ef6df94838 outputs: todos 2019-06-11 19:32:52 +02:00
Stéphane Lepin
fb05848426 requests: outputs API WIP 2019-06-11 19:32:52 +02:00
Stéphane L
e5be6b96fb general: version bump to 4.7 2019-06-11 19:32:32 +02:00
Stéphane Lepin
2d706a245a
Merge pull request #337 from DieserMerlin/patch-2 
Update README.md (+ obs-websocket-java library)
 2019-06-04 11:17:43 +02:00
Stéphane Lepin
1abc4f491b
readme: minor fix 2019-06-04 10:46:19 +02:00
Merlin Westphal
b21a45b43e
Update README.md 2019-06-01 00:08:19 +02:00
Stéphane Lepin
585f8450e1
Merge pull request #330 from Palakis/transitionbegin-hotfix 
Fix TransitionBegin event
4.6.1 		2019-05-21 00:05:24 +02:00
Stéphane L
d3401db5fe general: version bump to 4.6.1 2019-05-21 00:02:48 +02:00
Stéphane L
45dc6447bf events: fix how and when TransitionBegin is hooked 2019-05-20 23:54:13 +02:00
Stéphane L
409c270ba2 events: fix TransitionBegin event not triggering 2019-05-20 23:48:49 +02:00
Travis CI
aed0234d47 docs(travis): Update protocol.md - 07ebbe5 [skip ci] 4.6.0 2019-05-20 19:15:50 +00:00
Stéphane L
07ebbe56e6 docs: fix typos 
Fixes #328
Fixes #329
 2019-05-20 21:14:14 +02:00