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

759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 4.2.0 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
Stéphane L
87b47689eb Docs: more specific version number + tag unreleased methods/events 2017-09-08 21:42:13 +02:00
Stéphane L
c3346f9192 Notifications: correct IP address formatting 2017-09-08 00:23:17 +02:00
Stéphane L
3b0cf02574 Server: QThread wasn't actually used... 2017-09-08 00:01:26 +02:00
Stéphane L
4404889019 Merge pull request #117 from haganbmj/docs-since 
docs: Add @since
 2017-09-01 14:07:20 +02:00
Brendan Hagan
4e642d97fc docs: Add @since 2017-08-26 16:25:17 -04:00
Travis CI
44bd25646d docs(travis): Update protocol.md - 09b0403 [skip ci] 2017-08-24 18:28:28 +00:00
Stéphane L
09b04037a0 Merge pull request #114 from haganbmj/patch-1 
Update api doc for SwitchScenes
 2017-08-24 20:27:18 +02:00
Brendan Hagan
3c50e1e4d8 Update api doc for SwitchScenes 2017-08-24 10:18:00 -05:00
Travis CI
179ba9a9e6 docs(travis): Update protocol.md - 9ce2b19 [skip ci] 2017-08-19 13:06:57 +00:00
Logan S
9ce2b1983a Protocol: add Replay Buffer Events and Requests (#104) 2017-08-19 15:05:42 +02:00
Stéphane L
37dde278cb CI: updated name hack 2017-08-19 12:29:12 +02:00
Stéphane L
1cc57e7d1d CI: hack to show "build names" in Travis 2017-08-19 12:26:23 +02:00
Travis CI
60a5cdb154 docs(travis): Update protocol.md - f290cbc [skip ci] 2017-08-19 10:17:09 +00:00
Stéphane L
f290cbc148 Docs: update introduction with other versions 2017-08-19 12:15:57 +02:00
Stéphane L
2e2e9b1332 Code: small style fixes 2017-08-19 11:40:42 +02:00
Stéphane L
7915e3815b CMake on Windows: copy debug binaries to obs dev folder for testing 2017-08-19 11:40:25 +02:00
Travis CI
beb34deed8 docs(travis): Update protocol.md - a263d8a [skip ci] 2017-08-13 15:42:56 +00:00
Brendan Hagan
a263d8a364 Docs: Initial generation of docs from code comments (#106) 2017-08-13 17:41:42 +02:00
Palakis
1eccf4c899 Readme: update libraries and contributors 2017-08-12 22:11:06 +02:00
Palakis
d8d19d839a CI: add branch exclusion for gh-pages 2017-08-12 17:48:23 +02:00
Stéphane L
17e573d67f Merge pull request #109 from dragonbane0/request-types-sync-offset 
Add request types: SetSyncOffset and GetSyncOffset
 2017-08-12 14:51:26 +02:00
Marwin M
59de83b45d Update Protocol.md with the new request types 
Added SetSyncOffset and GetSyncOffset to the documentation
 2017-08-07 16:02:09 +02:00
Marwin M
712bd6e8f3 Fix if statement 
Add missing closing bracket and use !source_name instead of source_name == NULL
 2017-08-07 15:34:43 +02:00
Marwin M
75b21d070a Fix spacing 2017-08-07 02:34:54 +02:00
Marwin M
e91c9e7bf4 Fixed spacing 2017-08-07 02:34:20 +02:00
dragonbane
2562272775 Added new request types: SetSyncOffset and GetSyncOffset 2017-08-07 02:19:09 +02:00
Stéphane L
819621e307 macOS CI: fix dynlink paths 2017-08-06 22:59:44 +02:00
Stéphane L
4b9229311c macOS CI: oops, forgot to update some lines 2017-08-06 22:46:30 +02:00
Stéphane L
4c4c1de190 macOS CI: "brew versions" command doesn't work 2017-08-06 22:35:16 +02:00
Stéphane L
6b6b7feff2 macOS CI: properly use Qt from Homebrew 2017-08-06 22:28:07 +02:00
Stéphane L
9e3ce26ba0 Revert "macOS CI: install qt5 from Homebrew's index" 
This reverts commit ee1486274db4280f71e6f202c4f4bef1b7f37ba3.
 2017-08-06 22:12:36 +02:00
Stéphane L
eac19a7c83 Logging: log Qt versions at startup 2017-08-06 21:50:25 +02:00
Stéphane L
ee1486274d macOS CI: install qt5 from Homebrew's index 2017-08-06 21:45:24 +02:00
Stéphane L
8692e2afda CI: OBS version bump 2017-08-06 07:12:04 +02:00
Stéphane L
f995268444 macOS CI: symlink paths were wrong, again 2017-08-06 07:11:03 +02:00
Stéphane L
bd2e974718 macOS CI: fix symlink paths 2017-08-06 06:56:00 +02:00
Stéphane L
d1c64c7509 macOS CI: more debug statements 2017-08-06 06:30:00 +02:00
Stéphane L
30a19cfe8a macOS CI: add debug statements for rpath fix 2017-08-06 06:22:24 +02:00