Teddy Stoddard
1d30f13fd8
adding error response object method
2017-10-23 12:04:43 -04:00
Teddy Stoddard
b9ae28483c
adding error messages
2017-10-23 11:34:29 -04:00
Stéphane L
6a6d316e09
ci(linux + win): bump to latest OBS version
2017-10-22 00:01:44 +02:00
Stéphane L
22d2ee6bbd
Merge pull request #141 from PicoCentauri/master
...
macOS CI: Updated dependencies and namespaces
2017-10-21 23:57:41 +02:00
Philip Loche
68e55613fc
macOS CI: Updated dependencies and namespaces
...
Following the discussion of #105 the Qt version in the dependency
installation is now hardcoded to version 5.9.2, which is the same as the
main obs version for 20.1.0. Furthermore the names are changed from
osx to MacOS.
2017-10-19 17:32:58 +02:00
Ryan Foster
1d44d3a109
Fix saving replay buffer when no hotkey is set
...
This commit makes saving the replay buffer not rely on whether or not a
hotkey is set in OBS.
2017-10-19 05:34:39 -04:00
Palakis
11a641cc0d
replay buffer: update for Advanced output mode
2017-10-19 10:09:00 +02:00
Teddy Stoddard
7570fbf7a4
strings to ENUM strings
2017-10-17 19:07:40 -04:00
Teddy Stoddard
67f7e28867
fixing bounds type setter
2017-10-16 12:29:49 -04:00
Teddy Stoddard
9b2d30b4d5
switch string to ifelseif
2017-10-16 12:17:29 -04:00
Teddy Stoddard
399815525f
wrapping up setter and getter
2017-10-16 12:01:41 -04:00
Palakis
191cfa08d5
server: Refactor mutex lock handling
2017-10-16 15:29:23 +02:00
Palakis
fcf1fa8aff
studio mode: Remove parts of Qt UI hacks
2017-10-16 15:28:54 +02:00
Travis CI
73302cb060
docs(travis): Update protocol.md - 70a8533 [skip ci]
2017-10-16 11:13:41 +00:00
Palakis
70a8533f5e
docs(requests): fix SetStreamSettings
2017-10-16 13:12:49 +02:00
Teddy Stoddard
fe724db12d
removing copy paste error
2017-10-15 17:28:07 -04:00
Teddy Stoddard
096a8ec6ba
wip on setter and getter
2017-10-15 14:21:45 -04:00
Teddy Stoddard
cc5f9c9aa7
refining bounds and adding scale to setter
2017-10-15 11:57:21 -04:00
Teddy Stoddard
3e14b41600
ands to ors
2017-10-14 16:44:02 -04:00
Teddy Stoddard
ccc2bd8667
trying to fix duplicate case statment error
2017-10-14 16:35:36 -04:00
Teddy Stoddard
45f86b17f1
more WIP on setter
2017-10-14 15:18:06 -04:00
Teddy Stoddard
90aebecc5b
small fixes
2017-10-14 14:36:23 -04:00
Teddy Stoddard
b0170ef671
more WIP on setter
2017-10-14 13:10:40 -04:00
Teddy Stoddard
d418b4e624
fixing methods for getting inner object keys
2017-10-11 12:07:33 -04:00
Teddy Stoddard
47505547af
fixing some types
2017-10-11 11:51:05 -04:00
Teddy Stoddard
de2e73c9d4
WIP setter and fixing small typo
2017-10-10 21:14:27 -04:00
Teddy Stoddard
ab1a43163b
early return on bad param
2017-10-04 13:26:15 -04:00
Teddy Stoddard
2556dd320f
fixing bounds alignemnt getter
2017-10-04 13:05:01 -04:00
Teddy Stoddard
2120381c0e
correnting method name
2017-10-04 12:48:40 -04:00
Teddy Stoddard
dc06900f7f
another typo
2017-10-04 12:44:07 -04:00
Teddy Stoddard
7571dd5042
fixing typo
2017-10-04 12:13:52 -04:00
Teddy Stoddard
d6caa872b8
WIP some small fixes
2017-10-04 02:06:38 -04:00
Teddy Stoddard
2e9829ddd1
WIP questions to be answered
2017-10-04 00:51:16 -04:00
Teddy Stoddard
9621ea90f7
more WIP
2017-10-03 20:30:51 -04:00
Teddy Stoddard
f58da1254b
wip
2017-10-03 20:23:55 -04:00
Travis CI
a6ba7f8feb
docs(travis): Update protocol.md - 9c89f12 [skip ci]
2017-10-02 07:08:16 +00:00
Palakis
9c89f12275
docs: fix spec version links
2017-10-02 09:07:17 +02:00
Travis CI
41181f7260
docs(travis): Update protocol.md - 7251862 [skip ci]
2017-09-26 09:21:30 +00:00
Stéphane L
7251862ecf
Merge pull request #124 from haganbmj/patch-2
...
docs: HandleSetHeartbeat -> SetHeartbeat
2017-09-26 11:19:15 +02:00
Brendan Hagan
c0512d5b5f
docs: HandleSetHeartbeat -> SetHeartbeat
2017-09-25 11:32:34 -05:00
Travis CI
b9731dff21
docs(travis): Update protocol.md - 3981abc [skip ci]
2017-09-25 14:50:02 +00:00
Palakis
3981abc5ca
General: code and docs cleanup
2017-09-25 16:48:46 +02:00
Palakis
6aef437f58
UI: update French localization
2017-09-25 16:29:50 +02:00
RainbowEK
9b7752896a
Adding Heartbeat to obs-websocket. ( #112 )
...
* Added a Heartbeat in WSEvents (.cpp and .h updated)
Lines where the coded is added are marked with "//mod-0x =============" (x denotes a number).
* Updated the Heartbeat:
- Default it is off, and via JSON request can be switched on.
- The Heartbeat has configurable elements. Each individual element can be requested via a JSON request to be added to the Heartbeat.
- Maximum elements are in this example JSON update:
{
"current-profile": "#2-PGH",
"current-scene": "#2-HG",
"pulse": true,
"recording": false,
"streaming": false,
"total-record-time": 0,
"total-stream-time": 0,
"update-type": "Heartbeat"
}
* Cleaning
* Process all Palakis his comment/advice, and added 3 key/value pairs.
* Processed cleaning up comments as proposed by Stephane.
* Still found tabs in the comment header, and replaced by spaces.
* FUNCTIONAL MODIFICATION:
- Removed selective content of Heartbeat, and show all key/value parameters.
- Only request left is "on" or "off" selection of heartbeat.
FIX:
- Show streaming/recording related data only when streaming/recording is active, due to OBS showing wrong values when not active.
* Changed request type to start the Heartbeat to a boolean parameter.
* Delete ZERO_CHECK.log
* Delete obs-websocket_autogen.log
* Delete obs-websocket.log
2017-09-24 22:54:29 +02:00
Stéphane L
d074027610
Merge pull request #121 from haganbmj/toggle-notifications
...
general(notifications): Toggle tray notifications/alerts (Closes #120 )
2017-09-24 22:53:41 +02:00
Brendan Hagan
b137148186
general(notifications): Toggle tray notifications/alerts
...
Closes #120
2017-09-12 10:41:35 -05:00
Travis CI
e1f6260034
docs(travis): Update protocol.md - b24cbaa [skip ci]
2017-09-08 20:14:45 +00:00
Stéphane L
b24cbaa904
General: version bump to 4.2.1
2017-09-08 22:13:58 +02:00
Stéphane L
cc0b110d61
Utils: style nitpick
2017-09-08 21:54:40 +02:00
Travis CI
82a1e7d253
docs(travis): Update protocol.md - 87b4768 [skip ci]
2017-09-08 19:43:16 +00:00
