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

1219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
71392613b2
[Docs] Bump version to 4.8 2020-05-12 17:46:49 -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
Stéphane Lepin
ed4872b94c
Merge pull request #483 from tt2468/add-http-request-script 
Add obs-websocket-http
 2020-05-12 11:33:04 +02:00
Stéphane Lepin
8c5c6958cf
Merge pull request #476 from tt2468/patch-2 
[Bug Fix] Fix FreeType2 source type recognition
 2020-05-12 11:30:20 +02:00
tt2468
f9c81f99f2
Install into both dirs on Ubuntu instead of only one 2020-05-12 02:24:27 -07:00
tt2468
a3bc9f768a
Add error system to EnableStudioMode and DisableStudioMode 
As talked about in #144 this adds a check to `EnableStudioMode` and `DisableStudioMode` in order to be consistent with `StartRecording`/`StopRecording`
 2020-05-08 15:30:40 -07:00
tt2468
8d88bc19ed
Deprecate SetBrowserSourceProperties and GetBrowserSourceProperties 
Both of these requests are doing essentially the same thing as `GetSourceSettings` and `SetSourceSettings`, so there is no reason to have the extra bloat.
 2020-05-08 13:15:24 -07:00
tt2468
b2aa54f3f8
Add obs-websocket-http 
obs-websocket-http is a simple python script which allows users to run obs-websocket requests using an http-based api system. It is very simple and is a useful converter.
 2020-04-30 16:25:31 -07:00
tt2468
97836cc5eb
Remove extra source type strings 2020-04-30 10:58:10 -07:00
Stéphane Lepin
b1df0dca97
Merge pull request #474 from tt2468/patch-1 
Suppress websocketpp logging entries
 2020-04-30 19:40:22 +02:00
Stéphane Lepin
4a6816575a
Merge pull request #482 from Palakis/tt2468-start-error 
Add websocketpp error message to error dialog box
 2020-04-30 19:39:50 +02:00
Stéphane Lepin
31e2937b8d
Merge pull request #477 from tt2468/patch-3 
[Bug Fix] Don't build with captions on MacOS
 2020-04-30 19:38:56 +02:00
tt2468
0f434004a8 Add websocketpp error message to error dialog box 2020-04-30 10:08:56 -07:00
tt2468
ba75c45cee
Update build docs to add Ubuntu fix flag 2020-04-30 09:58:10 -07:00
tt2468
47492c3fa2
Implement fix for Ubuntu users 
#478 Broke building on linux. This implements a new variable to apply the fix.
 2020-04-30 09:46:22 -07:00
Stéphane Lepin
819917c4bf
Merge pull request #478 from Palakis/bugfix/ubuntu-packaging-fixes 
Ubuntu packaging fixes
 2020-04-28 11:40:20 +02:00
Stéphane Lepin
1ce0fd643c Revert "ci(linux): set package summary" 
This reverts commit a7d02a79a96d26e29b60a918d6c649b3fb6de82f.
 2020-04-28 11:18:22 +02:00
Stéphane Lepin
a7d02a79a9 ci(linux): set package summary 2020-04-28 10:29:48 +02:00
Stéphane Lepin
645cbf9888 ci(linux): fix debian package requires 2020-04-28 10:18:54 +02:00
Stéphane Lepin
b2d39ab2d7 cmake(linux): include GNUInstallDirs 2020-04-28 09:52:11 +02:00
Stéphane Lepin
5843521cf1 cmake(linux): use the standard LIBDIR and DATAROOTDIR install locations 2020-04-28 09:46:45 +02:00
Stéphane Lepin
4fbc45b40b ci(linux): make the deb package require OBS 25.0.7 2020-04-28 09:34:41 +02:00
tt2468
2719da3685
[Bug Fix] Don't build with captions on MacOS 
According to [this](https://github.com/obsproject/obs-studio/blob/master/UI/frontend-plugins/frontend-tools/CMakeLists.txt#L73), captions support is not active on MacOS, so we should not build it here.
 2020-04-27 10:55:16 -07:00
tt2468
f61bc809dd
[Bug Fix] Fix FreeType2 source type recognition 
OBS appears to be using a new format for the FreeType2 source, so we add the new kinds.

One thing I'm unsure on is if anything still uses the old naming stuff `text_ft2`/`text_ft2_v2`, since if not then we should not check
 2020-04-27 08:30:39 -07:00
tt2468
19f9593ac1
Supress websocketpp logging entries 2020-04-21 19:55:43 -07:00
Stéphane Lepin
e277cae799
Merge pull request #469 from tt2468/patch-1 
Add simpleobsws to list of language APIs
 2020-04-21 15:40:51 +02:00
tt2468
05baf6b8ac
Add simpleobsws to list of language APIs 
I've created a simple async Python library for people who just want the simple stuff.
 2020-04-21 05:30:21 -07:00
Stéphane Lepin
758441d65d
readme: fix CI badges 2020-04-17 15:00:51 +02:00
Stéphane Lepin
631a008fa0
readme: fixes 2020-04-15 10:36:12 +02:00
Stéphane Lepin
54e79936e5
ci(macos): add automated codesigning + notarization (#464) 2020-04-10 21:41:45 +02:00
Azure CI
a833822eae docs(ci): Update protocol.md - cfa8d8d [skip ci] 2020-04-10 16:27:48 +00:00
Stéphane Lepin
cfa8d8d180
Merge pull request #463 from tt2468/patch-1 
[Docs] Fix link to GetCurrentScene
 2020-04-10 18:27:18 +02:00
tt2468
b692756260
The actual fix 2020-04-10 08:14:25 -07:00
tt2468
dbc62ad63a
[Docs] Fix link to GetCurrentScene 
For some reason the link to the `GetCurrentScene` section of the docs was put into a codeblock
 2020-04-10 08:08:02 -07:00
Stéphane Lepin
2ac97dea35 installers: bump version 2020-04-07 17:35:49 +02:00
Stéphane Lepin
9451814299 ci(windows): fix installer suffix 2020-04-07 17:34:28 +02:00
Stéphane Lepin
5e01283018
Merge pull request #461 from Palakis/bugfix/disable-msvc-fh4 
cmake(msvc): disable FH4
 2020-04-06 20:00:27 +02:00
Stéphane Lepin
f7512c3cc0 cmake(msvc): disable FH4 2020-04-06 19:40:04 +02:00
Stéphane Lepin
f4997375e9 cmake: add version + fix /MP msvc flag 2020-04-06 19:09:01 +02:00
Stéphane Lepin
fbad54795e
Merge pull request #453 from Palakis/bugfix/macos-qt-path 
ci(macos): fix install_name_tool packaging step
 2020-04-03 10:13:52 +02:00
Stéphane Lepin
2ca85d05f0 ci(macos): fix install_name_tool packaging step 2020-04-01 08:51:48 +02:00
Azure CI
67e89e79be docs(ci): Update protocol.md - e467666 [skip ci] 2020-03-29 22:20:01 +00:00
Stéphane Lepin
e4676668bb
Merge pull request #449 from Palakis/bugfix/get-set-sceneitemproperties-item-id 
Target Scene Items per ID, in addition to scene name and source name
 2020-03-30 00:19:27 +02:00
Stéphane Lepin
3604995c2f requests(DeleteSceneItem + DuplicateSceneItem): backport dual "item" behaviour to existing functions 2020-03-30 00:02:36 +02:00