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

1626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stéphane Lepin
0802d03d74
Merge pull request #509 from Palakis/enhancement/sourcerenamed-isscene 
Events: Add sourceType string to SourceRenamed
 2020-05-26 09:42:03 +02:00
Stéphane Lepin
3970674003
Merge pull request #510 from Palakis/fix/fixwarnings 
General: Fix a few warnings
 2020-05-22 09:11:27 +02:00
tt2468
b00a93dd6b Requests: Add GetMediaSourcesList and minor refactor 
Adds `GetMediaSourcesList` which returns a list of all media sources,
along with their individual media playback states. In the process I
refactored a switch which coverts the enum to a QString into its own
helper function.
 2020-05-19 20:20:35 -07:00
tt2468
19b33a8558 Requests: Add scene transition override requests 
Adds these requests:
- `SetSceneTransitionOverride`
- `RemoveSceneTransitionOverride`
- `GetSceneTransitionOverride`
 2020-05-18 14:44:25 -07:00
tt2468
7918438747 Events: Add media events 
Adds the following events:

- `MediaPlaying`
- `MediaPaused`
- `MediaRestarted`
- `MediaStopped`
- `MediaNext`
- `MediaPrevious`
- `MediaStarted`
- `MediaEnded`
 2020-05-16 12:56:42 -07:00
tt2468
31a085db73 Docs: Update @since items 2020-05-16 12:11:26 -07:00
tt2468
72997eaa85 Merge branch '4.x-current' into category-mediacontrol 2020-05-16 12:08:28 -07:00
tt2468
7bb91da1d0 Events: Add sourceType string to SourceRenamed 
Since sources in OBS are also scenes, provide the user a string
so that they can differentiate.
 2020-05-15 16:54:30 -07:00
tt2468
e3e62c3903 General: Fix a few warnings 
Fix a few build warnings on windows because im ocd
 2020-05-15 16:52:08 -07:00
tt2468
631ed022ed Requests: Add SetSourceName (renaming sources) 
Adds the `SetSourceName` request which can be used to rename sources.

Also works on scenes since scenes in OBS are also sources.
 2020-05-15 16:13:24 -07:00
Azure CI
590943ed95 docs(ci): Update protocol.md - e9c17c9 [skip ci] 2020-05-15 02:20:46 +00:00
Stéphane Lepin
e9c17c9a1d
Merge pull request #496 from Palakis/request-setsourcemonitortype 
Requests: Add audio monitoring requests
 2020-05-15 04:20:07 +02:00
Stéphane Lepin
f8c8e42ae9 requests: rename Get/SetAudioMonitor to Get/SetAudioMonitorType 2020-05-15 04:10:40 +02:00
Stéphane Lepin
0b0560019a requests(Get/SetAudioMonitor): change values to camelCase for consistency 2020-05-15 04:08:40 +02:00
Azure CI
133d3fdda7 docs(ci): Update protocol.md - 53e98db [skip ci] 2020-05-15 00:48:51 +00:00
Stéphane Lepin
53e98dbe15
Merge pull request #484 from Palakis/add-screenshot-params 
Requests: Add new parameters to TakeSourceScreenshot
 2020-05-15 02:48:08 +02:00
Stéphane Lepin
0eaa9187ea requests(TakeSourceScreenshot): improved docs 2020-05-15 02:35:53 +02:00
Azure CI
344f5bda69 docs(ci): Update protocol.md - 33b080b [skip ci] 2020-05-14 20:48:16 +00:00
Stéphane Lepin
33b080b3b8
Merge pull request #495 from Palakis/volume-decibel-support 
Requests: Add useDecibel bool to GetVolume and SetVolume
 2020-05-14 22:47:33 +02:00
Stéphane Lepin
1c85894472 request(SetVolume): simplified params check 2020-05-14 22:31:10 +02:00
Stéphane Lepin
ba4e5959b1 requests(Get/SetVolume): code nitpicks 2020-05-14 22:24:58 +02:00
Azure CI
5534f9a248 docs(ci): Update protocol.md - eb20654 [skip ci] 2020-05-14 20:15:44 +00:00
Stéphane Lepin
eb206549ff
Merge pull request #503 from Palakis/feature/get-tr-pos 
Requests: Add GetTransitionPosition
 2020-05-14 22:14:59 +02:00
tt2468
0852f32b05 Merge branch '4.x-current' into request-setsourcemonitortype 2020-05-14 05:13:29 -07:00
tt2468
a1ea84b286 Docs: Its finally complaining less 2020-05-14 04:46:12 -07:00
tt2468
baba8790bc testing 2020-05-14 04:28:57 -07:00
tt2468
1da7f47af9 Docs: Add pr template 2020-05-14 03:43:18 -07:00
tt2468
60d9b72fea Docs: Maybe it will complain less now 2020-05-14 03:25:34 -07:00
tt2468
7a7a8b7ed1 Docs: Even more changes 2020-05-14 03:19:14 -07:00
tt2468
100565081c Docs: More changes 2020-05-14 03:11:17 -07:00
tt2468
27f82434b6 Docs: More work on various things 2020-05-14 03:01:28 -07:00
tt2468
353a9aa671 Update docs - initial pr draft commit 2020-05-14 02:13:50 -07:00
Stéphane Lepin
00da210365
Merge pull request #504 from Palakis/bugfix/windows-ci-prepare-obs 
ci(windows): simplified OBS Preparation script + shorter build times
 2020-05-14 11:11:08 +02:00
Stéphane Lepin
bce6c86e60
Merge pull request #481 from Palakis/tt2468-ubuntu-fix 
Fix install dir on Ubuntu by using new cmake flag
 2020-05-14 11:04:36 +02:00
Stéphane Lepin
bed6a1b1e2 ci(windows): simplified OBS Preparation script + shorter build times 2020-05-14 11:02:51 +02:00
tt2468
497443f012 Update CI scripts to use ubuntu fix 2020-05-14 01:47:55 -07:00
Stéphane Lepin
75a06afab0
Merge pull request #493 from Palakis/studio-mode-errors 
Add error system to EnableStudioMode and DisableStudioMode
 2020-05-14 10:34:05 +02:00
tt2468
121d9f4920 Remove GetTransitionPosition 
Moving it to its own PR since this PR will not make it into 4.8
 2020-05-14 01:14:46 -07:00
tt2468
56371a7d80 Add GetTransitionPosition 
Gets the current position of the active transition. Works on manual and also auto transition modes
 2020-05-14 01:11:47 -07:00
Azure CI
2810787156 docs(ci): Update protocol.md - 6b53cb5 [skip ci] 2020-05-14 08:04:35 +00:00
Stéphane Lepin
6b53cb59a5
Merge pull request #501 from Palakis/tt2468-bump-docs 
[Docs] Bump version to 4.8
 2020-05-14 10:03:51 +02:00
tt2468
64062cc879 Merge branch '4.x-current' into feature/t-bar 2020-05-13 20:51:23 -07:00
tt2468
7ca902e39a A few formatting fixes 2020-05-13 20:48:54 -07:00
tt2468
10ed2738f5 Add ReleaseTBar request and update SetTBarPosition to depend on OBS pr 2927 2020-05-13 00:10:57 -07:00
tt2468
71392613b2
[Docs] Bump version to 4.8 2020-05-12 17:46:49 -07:00
tt2468
4eb7bed2ff Lots of changes 
- Move `SetTBarPosition` to transitions category
- Add another check to `SetTBarPosition` so that we dont break the fabric of time with the wrong values
- Create `GetTransitionPosition` request in transitions category
 2020-05-12 15:44:57 -07:00
Azure CI
ff21f5b357 docs(ci): Update protocol.md - 98db248 [skip ci] 2020-05-12 09:37:41 +00:00
Stéphane Lepin
98db248776
Merge pull request #491 from Palakis/depricate-browserrequests 
Deprecate SetBrowserSourceProperties and GetBrowserSourceProperties
 2020-05-12 11:37:00 +02:00