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

1455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Azure CI
cb7c77d29e docs(ci): Update protocol.md - 83e23c9 [skip ci] 2021-01-28 23:26:40 +00:00
Stéphane Lepin
83e23c9c41
Merge pull request #638 from Palakis/feature/getsourcedefaultsettings 
Requests: Add GetSourceDefaultSettings
 2021-01-29 00:25:35 +01:00
Stéphane Lepin
c6db90ae07 request(GetSourceDefaultSettings): add sourceKind return value + fix param spec 2021-01-29 00:08:20 +01:00
Azure CI
c2aa7263bd docs(ci): Update protocol.md - 25be7ee [skip ci] 2021-01-28 22:57:37 +00:00
Stéphane Lepin
25be7ee14e
Merge pull request #628 from gdhgdhgdh/sceneitems-by-id 
Request: add ID support for SetSceneItemRender
 2021-01-28 23:56:53 +01:00
Stéphane Lepin
332876495d Utils: remove unused struct 2021-01-28 23:04:02 +01:00
Stéphane Lepin
6cbe50e3e7 request(SetSceneItemRender): refactor conditional 2021-01-28 22:56:01 +01:00
Stéphane Lepin
599eaf85ce requests(SceneItems): remove unused variables 2021-01-28 22:55:40 +01:00
Stéphane Lepin
c03ca47e37 Merge branch 'opencollective' into 4.x-current 2021-01-28 22:48:52 +01:00
Stéphane Lepin
2246ce5142 Merge branch '4.x-current' into opencollective 2021-01-28 22:48:34 +01:00
tt2468
79774921e4
Merge pull request #659 from harm27/harm27-obs-java-client 
readme: Added obs-java-client to the available API's
 2021-01-21 13:30:43 -08:00
Harm
ab453a0322 readme: Added obs-java-client to the available API's 2021-01-21 11:06:59 +01:00
tt2468
3725e400ce Merge branch 'feature/getsourcedefaultsettings' of https://github.com/Palakis/obs-websocket into feature/getsourcedefaultsettings 2021-01-20 04:22:38 -08:00
tt2468
9859c7b25f Utils: Use obs_data_item_get_name in OBSDataGetDefaults 2021-01-20 04:21:43 -08:00
Stéphane Lepin
056c1ef1fc
Merge pull request #641 from VMinute/bugfix/fix-list-scenes-collections 
General: Add ScenesCollection object
 2021-01-20 10:37:31 +01:00
Stéphane Lepin
41fbfb159a
Merge branch '4.x-current' into feature/getsourcedefaultsettings 2021-01-20 10:26:34 +01:00
Valter Minute
740a8a8d06 General: Add ScenesCollection object 
Adds a ScenesCollection object in the protocol definition,
replacing the current Array<String> return  with
Array<ScenesCollection>, keeping it more coherent with
other requests that return objects in the same format.
This will help automated code generation from comment.json
that otherwise would require ad-hoc handling for that specific
request.

Signed-off-by: Valter Minute <valter.minute@gmail.com>
 2021-01-20 10:22:33 +01:00
Azure CI
59ab9548c2 docs(ci): Update protocol.md - a1cf7f8 [skip ci] 2021-01-20 09:22:17 +00:00
Stéphane Lepin
a1cf7f8d32
Merge pull request #658 from Palakis/fix/tab-formatting 
Misc: Fix indentation of src files
 2021-01-20 10:21:24 +01:00
tt2468
0d59983d1a Misc: Fix indentation of src files 
Replace 4-space code with tabs to conform with the way its supposed to be.
 2021-01-19 18:30:18 -08:00
tt2468
488a57e2de Requests: Fix GetSourceDefaultSettings indentation and docs 2021-01-19 18:23:54 -08:00
Stéphane Lepin
492e9d8df7 editorconfig: set indent_size for C/C++ files 2021-01-20 00:28:50 +01:00
Stéphane Lepin
bc3b09dce4 WSServer(stop): wait for all connections to close 2021-01-20 00:08:24 +01:00
Stéphane Lepin
5fd95ce374
Merge pull request #649 from dnaka91/homebrew-instructions 
readme: Add Homebrew installation instructions
 2021-01-19 19:08:50 +01:00
Azure CI
77380a098e docs(ci): Update protocol.md - afc9c54 [skip ci] 2021-01-19 18:07:43 +00:00
Stéphane Lepin
afc9c549d6
Merge pull request #643 from Palakis/fix/createscene-sinceversion 
Requests: Fix wrong docs version for CreateScene
 2021-01-19 19:06:40 +01:00
Azure CI
77f38bbf63 docs(ci): Update protocol.md - 853eeb2 [skip ci] 2021-01-18 10:52:53 +00:00
Stéphane Lepin
853eeb2e6b
Merge pull request #636 from Palakis/enhancement/latest-translations 
Translations: Update translations with latest from crowdin
 2021-01-18 11:51:50 +01:00
Stéphane Lepin
6ed6b4a679
Merge pull request #637 from Palakis/fix/getstreamingstatus-docs 
Docs: Add recording-paused to documentation
 2021-01-18 11:51:17 +01:00
Stéphane Lepin
99987f9373
Merge pull request #644 from eric/stop-ws-server-on-exit 
Stop WSServer on OBS exit
 2021-01-18 11:49:00 +01:00
tt2468
b02239f3e3
Merge pull request #650 from dnaka91/rust-api 
readme: Add Rust client library
 2021-01-08 04:59:14 -08:00
tt2468
bc436e9ec4
Reorder library list 2021-01-08 04:58:07 -08:00
tt2468
7e0874abb4 Translations: Remove dutch StartFailed message and update other translations 
For some reason crowdin included it even though it is not approved.
The current unapproved translation uses the old string.
 2021-01-08 04:57:03 -08:00
Dominik Nakamura
3d704702ba
readme: Add Rust client library 
I created a client library in Rust to remote control OBS with
obs-websocket. Adding my library to the list of available
language APIs.
 2021-01-07 21:58:29 +09:00
Dominik Nakamura
2735f80637
readme: Add Homebrew installation instructions 
Give a short hint that the project can be installed with Homebrew on
MacOS as alternative to installing manually.
 2021-01-07 21:49:41 +09:00
Eric Lindvall
9275f7c2a9 Server: Stop WSServer on OBS exit 
This should fix issues with race conditions and crashes on OBS exit.
 2020-12-29 11:41:47 -08:00
tt2468
229641aba0 Requests: Fix wrong docs version for CreateScene 2020-12-24 13:38:58 -08:00
tt2468
ba143f2636 Translations: Update translations with latest from crowdin 2020-12-24 13:28:01 -08:00
tt2468
ffb34c3fd4 Requests: Add GetSourceDefaultSettings 
Adds a request, mainly for development purposes, which returns an
object of default settings for a given sourceKind (eg. `vlc_source`)
 2020-12-21 00:06:50 -08:00
tt2468
31c717eb40 Docs: Add recording-paused to documentation [skip ci] 
It wasn't included for some reason.
 2020-12-20 00:29:24 -08:00
tt2468
7ae016bd3b
Merge pull request #627 from Palakis/bugfix/deb-file-permissions 
ci(linux): fix deb package file permissions
 2020-12-20 00:02:44 -08:00
Stéphane Lepin
501e0f63f5 ci(linux): fix deb package file permissions 2020-12-19 22:54:46 -08:00
Stéphane Lepin
a42398c457
Merge pull request #635 from Palakis/enhancement/codefactor-badge 
README: Add codefactor badge
 2020-12-20 07:20:59 +01:00
Azure CI
d77e4ab10d docs(ci): Update protocol.md - 8a8ea92 [skip ci] 2020-12-20 06:20:47 +00:00
tt2468
8a8ea92140
Merge pull request #629 from marcan/volumes 
Requests: SetVolume: allow volumes > 1.0
 2020-12-19 22:20:12 -08:00
Hector Martin
adc46a80f9 Requests: SetVolume: allow volumes > 1.0 
Allow volumes > 1.0 / > 0dB, which is legal in OBS (you can do this in
Advanced Audio Properties). OBS allows up to +26dB gain, so we do the
same. This corresponds to approximately 20x linear gain (actually
19.9526231497, but 20 is easier to explain and OBS doesn't care).
 2020-12-19 22:16:47 -08:00
Stéphane Lepin
3203f50a43
Merge pull request #609 from Palakis/remove-captions-flag 
CI: Remove BUILD_CAPTIONS flag
 2020-12-20 06:55:19 +01:00
tt2468
3dea5fd4f4 README: Add codefactor badge 
They give us an A and I think that's pretty cool so might as well display it
 2020-12-19 21:51:25 -08:00
tt2468
1024a2198a
Merge pull request #631 from leafac/patch-1 
Add link to obs-cli
 2020-12-16 14:11:02 -08:00
Leandro Facchinetti
c8f0d5a3e4
Add link to obs-cli 2020-12-16 21:57:23 +00:00