489 Commits

Author SHA1 Message Date
Stéphane L
6bca8194cb Update README.md 2017-04-21 00:28:51 +02:00
Stéphane L
a4885f332d README: Add sponsor mention for Support Class 2017-04-21 00:28:20 +02:00
Palakis
cf97fb2051 Misc: add Support Class logo for sponsor mention 2017-04-20 23:38:43 +02:00
Stéphane L
20a8853854 Protocol spec: better readability 2017-04-20 23:26:41 +02:00
Palakis
dd487a5055 Version bump 2017-04-20 22:58:52 +02:00
Palakis
72ca07f571 Merge branch 'preview-api' 2017-04-20 22:27:46 +02:00
Palakis
c7305889c3 Events: add scene description to SwitchScenes and PreviewSceneChanged 2017-04-20 19:41:58 +02:00
Stéphane
bc24497760 Merge branch 'master' of github.com:Palakis/obs-websocket 2017-04-20 17:22:19 +02:00
Stéphane
200e65c730 OS X: Fix locales packaging 2017-04-20 17:22:01 +02:00
Palakis
b32d8ef1e7 Merge remote-tracking branch 'origin/master' 2017-04-20 17:09:22 +02:00
Palakis
8cfc613a3d Protocol spec: add missing scene visibility field in spec 2017-04-20 17:09:13 +02:00
Stéphane
5fbc2cbac7 OS X: fix linked libraries paths 2017-04-20 16:44:00 +02:00
Stéphane
9d7a32aa1f OS X: Fixed server threading issue 2017-04-20 16:24:41 +02:00
Stéphane
bcc9ef82d1 Oops, forgot to uncomment something 2017-04-20 16:16:36 +02:00
Stéphane
d6b28191e8 Fix another linker issue in OS X 2017-04-20 15:58:21 +02:00
Stéphane
acd8a9ea69 Travis: don't include unwanted artifacts 2017-04-20 14:35:48 +02:00
Stéphane
d4b8a8ff9e OS X: Fix linker issue 2017-04-20 14:25:56 +02:00
Stéphane
a698f7bdf5 Merge branch 'master' of github.com:Palakis/obs-websocket 2017-04-20 14:00:35 +02:00
Stéphane
16f07ff0c3 Travis OS X Packaging: include QtWebSockets in pkg 2017-04-20 13:58:31 +02:00
Palakis
ed4526751e Better param checks for Studio Mode request types 2017-04-20 10:06:43 +02:00
Palakis
e241518f8d Add StudioModeSwitched event 2017-04-20 09:53:31 +02:00
Palakis
a6677edbf5 Add ability to specify a transition when calling TransitionToProgram 2017-04-19 18:53:09 +02:00
Palakis
5748e163f8 Added GetPreviewScene and modified GetStudioModeStatus 2017-04-19 15:21:21 +02:00
Stéphane L
85fa6b60e2 Update PROTOCOL.md 2017-04-19 15:00:47 +02:00
Palakis
f0bb941c47 New request type : TransitionToProgram 2017-04-19 14:36:53 +02:00
Palakis
b7df1e8596 Add SetPreviewScene request type and PreviewSceneChanged event 2017-04-19 13:43:58 +02:00
Palakis
ff8eda3682 Fixed detection and control behaviour for some functions used by Preview API 2017-04-19 11:50:49 +02:00
Palakis
8c4bd91c78 New request types to get and set the status of Studio Mode 2017-04-19 11:34:37 +02:00
Palakis
07c868edcd Preliminary work on the Preview request types 2017-04-19 11:21:10 +02:00
Stéphane L
69061869a7 Update README.md 2017-04-17 02:17:45 +02:00
Stéphane L
98b2ac9bdc Update BUILDING.md 2017-04-17 02:14:55 +02:00
Stéphane
ef2bbff4e5 Travis: add support for tag package naming 2017-04-17 01:32:22 +02:00
Stéphane
7bb8e56072 Travis: fix OS X Packages project path 2017-04-17 00:56:29 +02:00
Stéphane
df0926f6fd Travis: OS X deploy 2017-04-17 00:52:07 +02:00
Stéphane
75572279a9 Travis: OS X packaging 2017-04-17 00:40:50 +02:00
Palakis
328c6a0f7c Travis: woops, wrong section 2017-04-16 05:12:00 +02:00
Palakis
ecd5062975 Travis: allow all branches for Linux deploy 2017-04-16 05:03:44 +02:00
Palakis
c01ae5610d Travis: pass tag env var to docker container 2017-04-16 04:55:03 +02:00
Palakis
564e7f31c3 Travis: better idea 2017-04-16 04:42:25 +02:00
Palakis
efa61952b3 Travis: better file glob 2017-04-16 04:35:08 +02:00
Palakis
ae27a26ebe Travis: fix checkinstall issue with version numbers 2017-04-16 04:19:22 +02:00
Palakis
d81076f720 Fix Travis deploy behaviour 2017-04-16 03:54:19 +02:00
Palakis
528f16c5e1 Travis: different approach for Linux builds upload 2017-04-16 03:43:25 +02:00
Palakis
13ac8bfa90 Travis: testing the contents of the folder but outside of the container 2017-04-16 03:11:53 +02:00
Palakis
935c58b17b Travis: trying packaging in another dir for upload 2017-04-16 01:32:32 +02:00
Palakis
31e133bf06 Travis: gosh 2017-04-16 01:22:26 +02:00
Palakis
eb7fb6694c Travis: okay, trying another strategy to get rid of build failures 2017-04-16 00:58:46 +02:00
Palakis
a298577da1 Travis: wrong path for artifacts 2017-04-16 00:43:20 +02:00
Palakis
8cd6d43ec4 Travis: wth happens with checkinstall builds 2017-04-16 00:27:02 +02:00
Palakis
b8fd143cc1 Travis Linux: fix possible permissions issue with the built package 2017-04-15 23:15:04 +02:00