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

1541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tt2468
58b49fed85
README: Add Dart client library 2021-05-17 14:28:13 -07:00
Stéphane Lepin
fe9419fb8a Merge branch 'bugfix/cmake-frontend-lib' into 4.x-current 2021-04-18 23:30:03 +02:00
Stéphane Lepin
ba93b05efa cmake: fix frontend api message + nitpicks 2021-04-18 23:29:20 +02:00
Stéphane Lepin
d154e77299 Merge branch '4.x-current' into bugfix/cmake-frontend-lib 2021-04-18 23:25:44 +02:00
Stéphane Lepin
2f8073d548
Merge pull request #702 from Palakis/fix/imageformats 
CMake: Copy other imageformats plugins too.
 2021-04-18 23:15:33 +02:00
Stéphane Lepin
1f0c1691be cmake: simplify package step 2021-04-18 23:00:26 +02:00
Stéphane Lepin
50eedd11e0 cmake: fix target directory path of QImage plugins 2021-04-18 22:56:09 +02:00
Stéphane Lepin
6f50628172
Merge pull request #727 from ZyanKLee/feature/ZyanKLee-inline-build 
allow inline build with obs-studio
 2021-04-18 22:47:08 +02:00
Stéphane Lepin
4256f2df8b Merge branch '4.x-current' into feature/ZyanKLee-inline-build 2021-04-18 22:20:13 +02:00
Stéphane Lepin
344f7c33e4 Merge branch '4.x-current' into fix/imageformats 2021-04-18 21:54:05 +02:00
Azure CI
39454bc13e docs(ci): Update protocol.md - fcffa55 [skip ci] 2021-04-18 19:53:39 +00:00
Stéphane Lepin
fcffa55af1
Merge pull request #705 from Palakis/fix/addsceneitem-docs 
Docs: Properly mark `setVisible` as optional
 2021-04-18 21:53:01 +02:00
Stéphane Lepin
b74afd1033
Merge pull request #701 from Palakis/ci-qt-upgrade 
CI: Various CI improvements
 2021-04-18 21:50:52 +02:00
Azure CI
ff548589bc docs(ci): Update protocol.md - f2f80c4 [skip ci] 2021-04-13 14:04:38 +00:00
tt2468
f2f80c4e7e
Merge pull request #706 from dnaka91/from-scene-optional 
docs: Mark from-scene as optional
 2021-04-13 07:03:54 -07:00
tt2468
381745dbf6 CI: Various improvements 2021-04-13 06:58:28 -07:00
Dominik Nakamura
1b61bd9551
Remove unnecessary files and changes 2021-04-13 22:24:20 +09:00
tt2468
415fb73245 CI: Update and improve Ubuntu build 2021-04-13 05:48:50 -07:00
tt2468
458d59b401 CI: Refactor much of the MacOS CI 2021-04-13 05:04:08 -07:00
tt2468
ffb24da135 CI: Update MacOS Qt version to 5.15.2 2021-04-13 04:19:41 -07:00
tt2468
30e2a5428f CI: Update Qt windows installer download 2021-04-11 20:21:18 -07:00
Azure CI
1154ba5b14 docs(ci): Update protocol.md - ffd89db [skip ci] 2021-04-09 17:59:19 +00:00
tt2468
ffd89dbdeb
Merge pull request #718 from flut1/bugfix/docs-output-settings 
Docs: fix typo in output properties
 2021-04-09 10:58:21 -07:00
Floris Bernard
b61211b4cb Docs: fix typo in output properties 2021-04-08 17:42:01 +02:00
ZyanKLee
30af0cbd9a
allow inline build with obs-studio 
when replacing CMAKE_SOURCE_DIR with CMAKE_CURRENT_SOURCE_DIR in the CMakeLists.txt this should allow for building the plugin directly inside of obs-studio as well as separately
 2021-03-29 10:06:08 +02:00
Dominik Nakamura
7e0bc1fd10
docs: Mark from-scene as optional 2021-03-21 14:53:45 +09:00
tt2468
b7bd95dcc4 CI: Use new source for Packages.pkg 2021-03-20 11:50:34 -07:00
tt2468
fde1ada699 Docs: Properly mark setVisible as optional 2021-03-20 07:44:26 -07:00
tt2468
7556c5f855 CMake: Copy other imageformats plugins too. 2021-03-19 01:45:52 -07:00
tt2468
4505612f75 CI: Update Qt and OBS deps on Windows 
- Update Qt to 5.15
- Update OBS dependencies to 2019
 2021-03-19 01:21:23 -07:00
Azure CI
035767bbbb docs(ci): Update protocol.md - 8e43958 [skip ci] 2021-03-19 05:05:52 +00:00
tt2468
8e43958f3d
Merge pull request #694 from ruggi99/feature/get-source-active 
Requests: Add GetSourceActive
 2021-03-18 22:05:06 -07:00
Azure CI
2be20a9179 docs(ci): Update protocol.md - 77f6335 [skip ci] 2021-03-19 05:03:26 +00:00
tt2468
77f63359f6
Merge pull request #697 from ruggi99/feature/add-volumedb 
Requests: Add volumeDb field to SourceVolumeChanged Event
 2021-03-18 22:03:11 -07:00
Blake B
b13822db8d
Requests: Add SetAudioTracks and GetAudioTracks (#690) 
* Requests: Add SetAudioTracks and GetAudioTracks

* Renamed mixer to track.

* Fix: Prevent pushing track out of range

* Fix: Changed result values back to track.

* Fix: Changed source parameter to sourceName.

* Fix: Updated @param.

* Revert "Fix: Updated @param."

This reverts commit 24a5eb6fabf9ddccd1bd0176cb695408e46306f9.
 2021-03-18 22:02:30 -07:00
Ruggero Tomaselli
452a307b33
Requests: Add volumedb field to SourceVolumeChanged Event 2021-03-10 12:01:09 +01:00
Ruggero Tomaselli
0db1abcd2e
Requests: Add GetSourceActive 2021-03-05 21:38:22 +01:00
Azure CI
01c898b104 docs(ci): Update protocol.md - 2344842 [skip ci] 2021-03-04 00:19:45 +00:00
Christopher P. Yarger
2344842163
Requests: Edit PlayPauseMedia (#685) 
* Request: Edit PlayPauseMedia

Removed requirement for boolean paramater from PlayPauseMedia. Changed
PlayPauseMedia to toggle play state if there is no boolean paramater.

* Docs: Edit PlayPauseMedia 

This commit also fixes some syntax

* will reset

* Add missing star to L48

Co-authored-by: tt2468 <tt2468@gmail.com>
 2021-03-03 16:18:57 -08:00
Azure CI
b8e693c97d docs(ci): Update protocol.md - 99e66cc [skip ci] 2021-03-03 14:50:01 +00:00
tt2468
99e66cc317
Merge pull request #691 from VodBox/feature/set-scale-filtering 
Requests: Add scale.filter to Scene Item Properties
 2021-03-03 06:48:59 -08:00
VodBox
18468c17f2 Requests: Add scale.filter to Scene Item Properties 2021-03-03 20:02:01 +13:00
Azure CI
6f0d056059 docs(ci): Update protocol.md - 6b05d03 [skip ci] 2021-02-28 02:17:20 +00:00
Stéphane Lepin
6b05d0381e
Merge pull request #687 from Palakis/feature/batch-delay 
Requests: Add Sleep
 2021-02-28 03:16:37 +01:00
Stéphane Lepin
e8c4d2b550
Merge pull request #674 from Palakis/fix/ubuntu-tag-releases 
CI: Fix tag detection
 2021-02-28 03:06:09 +01:00
Stéphane Lepin
7e14032d2b
requests(Sleep): update parameter name 2021-02-28 03:05:42 +01:00
tt2468
bb0a0acbda Requests: Add Sleep 
New request to induce delay in the processing of `ExecuteBatch`
 2021-02-27 09:35:37 -08:00
Stéphane Lepin
9bbfb73622 chore: safety-checks before accessing the result of GetConfig() 2021-02-24 19:06:08 +01:00
tt2468
d45d98d536 CI: Fix tag detection 2021-02-10 16:34:37 -08:00
Stéphane Lepin
9e554ce527 ci(macos): update InstallAppleCertificate action to version 2 2021-02-10 13:32:13 +01:00