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

1387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stéphane Lepin
f96b40bbf8
Merge pull request #573 from Palakis/fix/sfr-enabled 
Docs: Add `enabled` field to `SourceFiltersReordered`
 2020-09-15 11:35:23 +02:00
tt2468
9679de097f
Installer: Don't show warning when obs directory is not empty 
More info here: https://jrsoftware.org/ishelp/index.php?topic=setup_direxistswarning
 2020-08-21 22:43:42 -07:00
tt2468
a51ad1383b Docs: Fix requests marked as "unreleased" 2020-08-12 16:54:03 -07:00
tt2468
1dd96fa714
Docs: Add enabled field to SourceFiltersReordered 
Was noticed in Discord that this was missing from the docs
 2020-07-31 22:08:07 -07:00
Stéphane Lepin
8285805108
Merge pull request #571 from Palakis/bugfix/569-tray-icon-crash 
Utils(GetTrayIcon): refactor with frontend API function
 2020-07-29 17:06:01 +02:00
Stéphane Lepin
d91b3f8dd9 Utils(GetTrayIcon): refactor with frontend API function 2020-07-28 02:23:31 +02:00
Stéphane Lepin
6734c928a2
Merge pull request #563 from venepe/raspberry-pi 
CMakeLists: Compile for arm targets
 2020-07-19 12:22:15 +02:00
venepe
58448f363b CMakeLists: Compile for arm targets 2020-07-18 13:48:52 -05:00
Stéphane Lepin
2e32b7e299
Merge branch '4.x-current' into enhancement/various-todos 2020-07-15 15:02:00 +02:00
Azure CI
a651a1a69f docs(ci): Update protocol.md - c368696 [skip ci] 2020-07-15 13:01:23 +00:00
Azure CI
c368696ddc docs(ci): Update protocol.md - 94269c0 [skip ci] 2020-07-15 13:00:59 +00:00
Stéphane Lepin
94269c0640
Merge pull request #557 from julijane/feature-screenshot-default 
TakeSourceScreenshot: default to current scene
 2020-07-15 15:00:43 +02:00
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
tt2468
9c4bd7a487 Requests: Scene collection and profile name checking 
For `SetCurrentProfile` and `SetCurrentSceneCollection`, check if it
exists before attempting to switch to it, and return an error if it
does not exist.
 2020-07-11 05:00:10 -07:00
tt2468
eb00294bbb Settings: Add option to lock binding to IPv4 
WebsocketPP defaults to binding to an IPv6 interface. Since IPv6
is broken on so many networks, this adds an option to force WebsocketPP
to use the default IPv4 interface to bind to.
 2020-07-09 22:21:48 -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
Juliane Holzt
31a505f4a4
Do it when sourceName is omitted 2020-07-09 00:50:29 +02:00
Juliane Holzt
bfa6cd0e19
TakeSourceScreenshot: default to current scene 2020-07-09 00:43:54 +02: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