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

830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Travis CI
979e0ddc88 docs(travis): Update protocol.md - 9fab714 [skip ci] 2019-04-16 23:23:02 +00:00
Stéphane Lepin
9fab714674
Merge pull request #293 from Vainock/patch-1 
Make "WebSocket" consistent
 2019-04-17 01:22:30 +02:00
Stéphane Lepin
2eb6463ab0
Merge pull request #272 from BarryCarlyon/scene_item_transform 
Support item_transform signal
 2019-04-17 01:21:46 +02:00
Stéphane L
5e4d6fbd3f utils: refactored docs and impl of scene item properties 2019-04-17 01:09:05 +02:00
Stéphane L
30df5f3558 events: fix typo 2019-04-17 00:15:15 +02:00
Stéphane Lepin
252dd7e09f utils: indent fixes 2019-04-17 00:15:15 +02:00
Stéphane Lepin
2915690d22 utils: use obs_data_t for returned values 2019-04-17 00:15:15 +02:00
Barry Carlyon
1993596232 Requested changes to move the common code to a utils function. 2019-04-17 00:15:15 +02:00
Barry Carlyon
8946e8997f Update WSEvents.cpp 
Requested changes.

I swapped "obs_data_set_string(data, "name", itemName.toUtf8());" for scene-item and item-name as otherwise you don't know what scene the item was changed on (studio mode if you change items on a non active scene)
 2019-04-17 00:15:15 +02:00
Barry Carlyon
dfeb156da9 Documentation/comment fix 2019-04-17 00:15:15 +02:00
Barry Carlyon
c10c35e38e Forgot to declare the function 2019-04-17 00:15:15 +02:00
Barry Carlyon
67bfdde113 Update WSEvents.cpp 
Clone OnSceneItemAdd to a new function to support the `item_transform` signal. Emit as `SourceItemChanged`
 2019-04-17 00:15:15 +02:00
Travis CI
c62178a7fe docs(travis): Update protocol.md - c12a432 [skip ci] 2019-04-16 21:14:32 +00:00
Stéphane Lepin
c12a4323e7
Merge pull request #279 from derrod/captions 
Add caption handler
 2019-04-16 23:12:20 +02:00
Stéphane L
fd1c4abad7 requests(streaming): conditional compilation of SendCaptions 2019-04-16 22:51:49 +02:00
Vainock
bd4fe5a1a7
Make "WebSocket" consistent 2019-04-16 15:48:09 +02:00
Stéphane Lepin
190f5ebfc4 chore: empty commit to trigger ci again 2019-04-16 14:03:30 +02:00
Stéphane Lepin
79493df32e requests(streaming): fix docs on SendCaptions 2019-04-16 13:11:46 +02:00
Stéphane Lepin
71d523437e
Merge pull request #287 from Lange/4.5.1-types-cleanup 
docs(jsdoc): clean up types for compatability with obs-websocket-js typedef generator
 2019-03-30 22:08:09 +01:00
Alex Van Camp
268f503875 docs(jsdoc): clean up types for compatability with obs-websocket-js typedef generator 2019-03-30 14:26:58 -05:00
Travis CI
5ac47b823f docs(travis): Update protocol.md - ec572da [skip ci] 2019-03-30 14:36:45 +00:00
Stéphane L
ec572da822 docs: update release 2019-03-30 15:35:18 +01:00
Stéphane L
37f96b8cf2 chore: bump to 4.6.0 2019-03-30 15:34:06 +01:00
derrod
545db60b98 ci: enable/build captions 2019-03-22 10:27:27 +01:00
derrod
f65fdcdbc1 handler: Add caption handler 2019-03-22 10:24:25 +01:00
Stéphane Lepin
579acabe5e
Merge pull request #283 from Palakis/ubuntu-deb-fix 
Fix package on Ubuntu
 2019-03-22 01:46:22 +01:00
Stéphane Lepin
f2a9ff8551 ci(linux): fix Ubuntu package 2019-03-22 01:40:29 +01:00
Stéphane Lepin
2e40e07563
Merge pull request #282 from Palakis/azure-pipelines 
ci(macos): setup Azure Pipelines
 2019-03-21 23:14:16 +01:00
Stéphane Lepin
cb3af837c6 readme: fix building.md 2019-03-21 22:36:30 +01:00
Stéphane Lepin
3cce89ea3f ci(macos): fix artifacts publishing 2019-03-21 22:28:08 +01:00
Stéphane Lepin
5f2dfb24ca ci(macos): checkout submodules 2019-03-21 22:18:29 +01:00
Stéphane Lepin
4bc02a7389 ci(macos): install boost 2019-03-21 21:56:07 +01:00
Stéphane Lepin
eeeca8afd0
ci(macos): remove set -ev 2019-03-17 15:38:59 +01:00
Stéphane L
4f607df5fc ci(macos): fix typo 2019-03-17 15:01:01 +01:00
Stéphane L
e06b3e2052 readme: Azure Pipelines CI badge 2019-03-17 14:48:17 +01:00
Stéphane L
b14b18e4be ci(macos): setup Azure Pipelines 2019-03-17 14:45:41 +01:00
Stéphane Lepin
fb616b4b53 docs: update README and BUILDING 2019-01-04 11:36:38 +01:00
Stéphane L
a1c5bc00bc Merge branch 'pragma-once' into 4.x-current 2019-01-01 18:46:38 +01:00
Stéphane L
0921632f87 general(headers): replace include guards with "#pragma once" 2019-01-01 18:46:23 +01:00
Stéphane Lepin
38ad465233
Merge pull request #266 from Palakis/response-return 
Return response in request handlers
 2019-01-01 18:23:22 +01:00
Stéphane L
881de01073 minor fixes 2019-01-01 18:08:47 +01:00
Stéphane L
2d973e0b90 handler: return obs_data_t objects 2019-01-01 17:54:29 +01:00
Stéphane L
e9b43b9b2a handler: refactor response passing 2019-01-01 17:25:08 +01:00
Stéphane Lepin
b9193989b0
requests(sources): missing return statements 2019-01-01 17:23:58 +01:00
Stéphane Lepin
be6d9791f5
Merge pull request #265 from Palakis/websocketpp-4.x 
Replace QWebSocketServer with websocket++ in 4.x
 2019-01-01 16:35:08 +01:00
Stéphane L
baac1b1d80 server: clarifying things 2019-01-01 15:57:29 +01:00
Stéphane L
40e2d410dd server: use std::string in broadcast 2019-01-01 05:29:51 +01:00
Stéphane L
11617eea99 server: remove useless base64 helper 2019-01-01 05:16:57 +01:00
Stéphane L
5748c4d0ec general: fix crash on exit 2019-01-01 05:13:08 +01:00
Stéphane L
2e5b903eae events: singleton shared pointer refactor 2019-01-01 05:07:55 +01:00