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
1,313 Commits 6 Branches 45 Tags
Commit Graph

1313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stéphane Lepin
5da6588ee6
Merge pull request #555 from Palakis/fix/docs-updates 
Docs: Various docs improvements
 2020-07-15 14:59:52 +02:00
tt2468
ac9c6b4a1f Docs: Fix GDIPlus requests documentation 
`bk-color` and `bk-opacity` are actually `bk_color` and `bk_opacity`
respectively. Issue reported in #561
 2020-07-12 02:22:26 -07:00
tt2468
aa8fa00811 Docs: More updates 
Changes the media stuff's `@since 4.9.0` to `@since unreleased`
to reduce potential confusion on the docs. As a part of the final
4.9.0 commits, I will be changing it back to 4.9.0. We also fix the
contributing document since it was all messed up.
 2020-07-11 05:26:49 -07:00
Azure CI
04c60fd1ac docs(ci): Update protocol.md - 80de8ad [skip ci] 2020-07-09 10:40:21 +00:00
Stéphane Lepin
80de8ada57
ci: fix Azure Pipelines not running on 4.x-current 2020-07-09 12:39:40 +02:00
tt2468
9cdb32d56a Docs: Various docs improvements 
I noticed that some parts of the docs were inconsistent/lacking.
Decided to go through all of them and update them.
 2020-07-09 03:27:44 -07:00
Stéphane Lepin
c51ecda6b4
Merge pull request #527 from Palakis/feature/component-management 
Requests: Sceneitem manipulation requests
 2020-07-03 18:21:01 +02:00
Stéphane Lepin
471d44ae11
Merge pull request #551 from Palakis/fix/mediafixes 
Requests/Events: Use sourceKind instead of sourceTypeId
 2020-07-03 16:22:20 +02:00
tt2468
513bd1372b Docs, Requests: Fix GetSceneItemList code revisions 
Replace the `sourceId` term with `sourceKind` to match everything else.
 2020-07-03 07:12:28 -07:00
tt2468
355cee0db9 Merge branch '4.x-current' into feature/component-management 2020-07-03 07:07:52 -07:00
tt2468
38936173d1 Requests/Events: Use sourceKind instead of sourceTypeId 
Left in some old terms accidentally. This fixes it.
 2020-07-03 07:03:25 -07:00
Stéphane Lepin
eea56b4c71
Merge pull request #497 from Palakis/category-mediacontrol 
Requests/Events: Media Source/VLC
 2020-07-03 15:56:21 +02:00
Stéphane Lepin
802cc3a48f
Apply suggestions from code review 2020-07-03 15:48:56 +02:00
Stéphane Lepin
ba4720012d
Merge pull request #550 from Palakis/enhancement/readme-fix 
Docs: Move ssl tunnelling guide to its own page
 2020-07-03 15:30:34 +02:00
tt2468
4f83b73732 Docs: Move ssl tunnelling guide to its own page [skip ci] 
Having the SSL tunneling instructions on the README caused clutter and was
unnecessary.
 2020-07-03 06:23:48 -07:00
Stéphane Lepin
68db13fc24
Merge pull request #549 from Palakis/feature/more-output-statuses 
Requests: Add Replay Buffer and Recording Statuses
 2020-07-03 14:29:25 +02:00
tt2468
2d4dd580b4
Merge pull request #547 from WizardCM/audio-active 
Requests, Events: Add support for Audio Active
 2020-07-03 03:42:36 -07:00
Matt Gajownik
d03e94ada8 events: Add support for audio_active, fix docs version 2020-07-03 03:30:58 -07:00
Stéphane Lepin
91126a59c2
Merge pull request #505 from Palakis/docs-updates 
Docs: Update and split up main documentation
 2020-07-03 11:47:54 +02:00
tt2468
bd18aee43c Docs: Update issue template to be **better** 2020-07-03 02:42:29 -07:00
tt2468
4ead1c3de5 Requests: Add Replay Buffer and Recording Statuses 
Adds `GetReplayBufferStatus` and `GetRecordingStatus`.

v5.0 Will remove the recording status functionality from
`GetStreamingStatus`
 2020-07-03 02:26:38 -07:00
Stéphane Lepin
f3b2a6eba2
Merge pull request #471 from PatTheMav/github-actions-tag 
CI: Add Github Actions workflow for release tags
 2020-07-03 10:22:39 +02:00
Stéphane Lepin
c4d9a27d2f
Merge pull request #470 from PatTheMav/github-actions-pr 
CI: Add Github Actions workflow for PRs and pushes to main branch
 2020-07-03 10:22:09 +02:00
tt2468
fdcba2734d Events, Docs: Refactor media events and improve docs 
Move duplicated functionality to a helper function and added some docs
clarifying the behavior of the events, and fixed a few typos in
the request handlers.
 2020-07-02 13:13:19 -07:00
Stéphane Lepin
981ba7b28f
Merge pull request #529 from Palakis/fix/getvolumedecibel 
Requests: Fix useDecibel response when volume is -infinity
 2020-07-02 21:08:45 +02:00
Matt Gajownik
822a1751a2 requests: Add support for audio_active 2020-07-01 22:23:22 +10:00
tt2468
a4279d09a6
Merge pull request #546 from curtgrimes/bugfix/reenable-macos-captions 
[Bug Fix] Reenable building with captions on MacOS
 2020-07-01 04:24:40 -07:00
Curt Grimes
14d43ac05b [Bug Fix] Reenable building with captions on MacOS 
OBS on MacOS supports closed caption encoding. The Windows-only dependencies [here](https://github.com/obsproject/obs-studio/blob/master/UI/frontend-plugins/frontend-tools/CMakeLists.txt#L73) are only related to audio capture, not closed caption encoding.
 2020-06-29 20:24:11 -05:00
tt2468
5e6c92ab16 Merge branch '4.x-current' into category-mediacontrol 2020-06-08 01:04:16 -07:00
tt2468
9ced745258
Merge pull request #533 from Twasi/bugfix/Correct-position-data-type 
Bugfix/correct position data type
 2020-06-04 14:30:58 -07:00
Lars Bärtschi
948f6ccd95 Also change all other occurrences and documentation where int was used for transform position 2020-06-04 15:42:27 +02:00
Lars Bärtschi
1c58727ca9 Change position datatype from int to double (as it is in OBS) 2020-06-04 15:28:47 +02:00
Stéphane Lepin
612bd9960c
readme: add TLS tunneling section 2020-06-04 10:14:58 +02:00
tt2468
1474499886 Requests: Add GetSceneItemList 
Adds a new `GetSceneItemList` request to get all scene items in a
specified scene.
 2020-05-29 00:00:16 -07:00
tt2468
cf99c68843 Requests: Fix useDecibel response when volume is -infinity 
When the volume in OBS is -infinity, `GetVolume` returns a decibel value of
either 0, or in some cases no `volume` property at all. This makes `GetVolume`
return a decibel value of -100.0 if the real volume is -infinity.
 2020-05-28 22:45:08 -07:00
tt2468
d2865b9f4f Requests: Add AddSceneItem 
New request `AddSceneItem` which allows you to add a
source to a scene. Returns an itemId which can be used
to manipulate the item further if necessary.
 2020-05-28 22:20:25 -07:00
tt2468
865c0c79db Docs: Rework some more of the readme 2020-05-28 16:45:05 -07:00
tt2468
3462e7f50e Docs: Add new logo and update header 2020-05-28 16:35:21 -07:00
tt2468
37e412e710 Docs: Add discord shield to readme 2020-05-28 16:16:31 -07:00
tt2468
5822992b44
Merge pull request #524 from ProstoSanja/create-scene 
Add request `CreateScene` to `scenes`
category
 2020-05-27 21:21:14 -07:00
Alex Tsernoh
eb7787fb7d Docs: Fix param name 2020-05-27 11:18:39 +03:00
Alex Tsernoh
f1371034f7 Request: Add CreateScene 2020-05-27 01:03:01 +03:00
Azure CI
5d12dfa368 docs(ci): Update protocol.md - c428201 [skip ci] 4.8.0 2020-05-26 21:49:10 +00:00
Stéphane Lepin
c4282011fa
Merge pull request #516 from Palakis/feature/SetSceneTransitionOverride 
Requests: Add scene transition override requests
 2020-05-26 23:48:33 +02:00
Stéphane Lepin
9ddc22fa94 request(SetSceneTransitionOverride): override duration only if it is explicity set so or not already defined 2020-05-26 23:36:18 +02:00
Stéphane Lepin
517788e86a request(scenes): refactor Set/Get/RemoveSceneTransitionOverride + use current transition duration 2020-05-26 23:26:37 +02:00
Azure CI
ed29ec528d docs(ci): Update protocol.md - 481b26d [skip ci] 2020-05-26 11:58:51 +00:00
Stéphane Lepin
481b26d09d
Merge pull request #508 from Palakis/feature/setsourcename 
Requests: Add SetSourceName (renaming sources)
 2020-05-26 13:58:10 +02:00
tt2468
da66ad6d41 Merge branch '4.x-current' into feature/setsourcename 2020-05-26 01:41:11 -07:00
Azure CI
1f75b305c3 docs(ci): Update protocol.md - 0802d03 [skip ci] 2020-05-26 07:42:47 +00:00