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
Stéphane Lepin
e30dce8b21 Merge branch '4.x-current' into feature/createsource 2020-11-27 12:24:13 +01:00
Stéphane Lepin
6d12af3858 Merge branch '4.x-current' into feature/t-bar 2020-11-27 12:23:47 +01:00
Azure CI
b9cbd0ecd1 docs(ci): Update protocol.md - 3d7511c [skip ci] 2020-11-27 11:19:36 +00:00
Stéphane Lepin
3d7511ca75
Merge pull request #605 from Palakis/feature/get-set-transition-settings 
Get/Set Transition Settings
 2020-11-27 12:18:50 +01:00
tt2468
fabf68b635 CI: Remove BUILD_CAPTIONS flag 
OBS has removed the `BUILD_CAPTIONS` flag from their repo. No reason to keep it
 2020-11-02 23:20:40 -08:00
Azure CI
11326274e0 docs(ci): Update protocol.md - acd3940 [skip ci] 2020-10-25 18:34:53 +00:00
Stéphane Lepin
acd3940a7b
Merge pull request #593 from Palakis/feature/getsceneitemlist-default-scene 
requests(GetSceneItemList): fallback to current scene if sceneName is not specified
 2020-10-25 19:34:11 +01:00
Stéphane Lepin
8ba441da7f requests(transitions): remove TODO 2020-10-25 19:33:42 +01:00
Stéphane Lepin
5d9d5e0746 request(SetSourceSettings): remove redundant obs_data_apply step 2020-10-25 19:25:48 +01:00
Stéphane Lepin
7a31e88ed6 requests: add GetTransitionSettings and SetTransitionSettings 2020-10-25 19:25:26 +01:00
Azure CI
d9f35a855d docs(ci): Update protocol.md - 9678d59 [skip ci] 2020-10-01 07:56:26 +00:00
Stéphane Lepin
9678d59bbe
Merge pull request #598 from Palakis/fix/hotkey-docs-typo 
Docs: Fix typo
 2020-10-01 09:55:34 +02:00
tt2468
0be5564ce7
Docs: Fix typo 2020-09-30 15:57:13 -07:00
Azure CI
8a90051ab5 docs(ci): Update protocol.md - 02c7a7f [skip ci] 2020-09-30 22:22:57 +00:00
tt2468
02c7a7f7c7
Merge pull request #595 from LorenaGdL/feature/hotkey-requests 
Requests: Add hotkeys press events
 2020-09-30 15:22:22 -07:00
tt2468
e7c8c1d6b6
Requests: Update hotkey docs and rename some variables 2020-09-30 15:02:59 -07:00
LorenaGdL
449ad6d13c PR review changes: Modify requests names 
Changes requests names to "TriggerHotkeyByName" and "TriggerHotkeyBySequence"
 2020-09-30 19:15:23 +00:00
Stéphane Lepin
ae4ee0332c
Fix macOS CI (#597) 
* ci(macos): fix attempt #1

* Revert "ci(macos): fix attempt #1"

This reverts commit b846490136973872ac3b724637cef303e3255083.

* ci(macos): provide QTDIR when building OBS

* Revert "ci(macos): provide QTDIR when building OBS"

This reverts commit 74a882fcf4b9e502b1125508d796b29b69ec0e73.

* ci(macos): use local qt formula

* ci(macos): update qt.rb
 2020-09-30 12:19:37 +02:00
Stéphane Lepin
4a4c97aac4 request(GetSceneItemList): provide scene name in response 2020-09-29 23:48:35 +02:00
Stéphane Lepin
4491da0350 requests(GetSceneItemList): fix empty/non-present parameter detection 2020-09-29 23:48:17 +02:00
Stéphane Lepin
32960afc1b requests(GetSceneItemList): update docs 2020-09-29 19:45:07 +02:00
Stéphane Lepin
46f624e3b9 requests(GetSceneItemList): fallback to current scene if sceneName is not specified 2020-09-29 19:37:28 +02:00
LorenaGdL
9daae857de Requests: Add ProcessHotkeyByCombination 
Adds a new request called `ProcessHotkeyByCombination` which calls the
routine associated with a given hotkey. The hotkey is identified by the
combination of keys set by the user to trigger it. Multiple routines
are called if the same combination is bound to different hotkeys.
 2020-09-29 13:43:00 +00:00
LorenaGdL
bac5b1551b Requests: Add ProcessHotkeyByName 
Adds a new request called `ProcessHotkeyByName` which calls the routine
associated with a given hotkey. The hotkey is identified by the unique
name set while registering it. Works with both OBS default hotkeys and
hotkeys added by plugins/scripts.
 2020-09-29 13:38:32 +00:00
tt2468
f61f45fa23
Merge pull request #592 from rodrigograca31/improve-docs 
docs: 📝 list multiple available web clients
 2020-09-24 12:54:52 -07:00
Rodrigo Graça
fbc6e02ff6
docs: 📝 list multiple available web clients 2020-09-24 13:16:57 +01:00
Stéphane Lepin
56a17a9131
Merge pull request #560 from Palakis/enhancement/various-todos 
Requests: Scene collection and profile name checking
 2020-09-16 21:51:08 +02:00
Stéphane Lepin
a148f7fd7c requests(Profiles + SceneCollections): fix crash on change 2020-09-16 21:45:31 +02:00
Stéphane Lepin
0dd0d01e8f requests(Profiles + SceneCollections): don't use QString where it is not needed 2020-09-15 18:17:45 +02:00
Stéphane Lepin
bcd16d791c
Merge pull request #559 from Palakis/enhancement/ipv4-option 
Settings: Add option to lock binding to IPv4
 2020-09-15 17:19:27 +02:00
Stéphane Lepin
539e636939 requests(SceneCollections): fix typo (profiles instead of scene collections) 2020-09-15 17:14:53 +02:00
Stéphane Lepin
7f1c4a1c4c Utils: simplified string list lookup 2020-09-15 17:12:34 +02:00
tt2468
6b254e0ad5 Requests: Add CreateSource and clean up code 2020-09-15 02:51:03 -07:00
Stéphane Lepin
f36185a964
Merge pull request #583 from Palakis/fix/no 
Installer: Don't show warning when obs directory is not empty
 2020-09-15 11:36:54 +02:00
Azure CI
588487f860 docs(ci): Update protocol.md - f3ab210 [skip ci] 2020-09-15 09:36:27 +00:00
Stéphane Lepin
f3ab2100f0
Merge pull request #578 from Palakis/fix/request-versions 
Docs: Fix requests marked as "unreleased"
 2020-09-15 11:35:46 +02:00
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