182 Commits

Author SHA1 Message Date
Stéphane L
f5336938c9 Update README.md 2017-03-12 11:57:41 +01:00
Stéphane L
4985548edf Update pt-BR.ini 2017-03-10 08:33:39 +01:00
Stéphane L
8bc4841e84 Merge pull request #53 from laris151/laris151-portuguese
Add Portuguese Translate
2017-03-10 08:32:46 +01:00
laris151
634f9833a1 Add Portuguese Translate 2017-03-09 22:28:04 -03:00
Stéphane L
80052e62ee Update README.md 2017-03-05 17:10:18 +01:00
Palakis
0672b6a157 Fixed typo in PROTOCOL.md 4.0.0 2017-03-02 15:55:46 +01:00
Palakis
1e71bfa151 Fixed a crash when switching to another scene after switching to another scene collection 2017-03-02 15:36:48 +01:00
Palakis
d4c2c8197a Merge branch 'master' of github.com:Palakis/obs-websocket 2017-03-02 15:07:11 +01:00
Palakis
c9baed2df9 Fixes #24 2017-03-02 15:02:26 +01:00
Stéphane L
1e2065c84a Merge pull request #50 from G-monitor/chinese
Add chinese translation
2017-03-02 14:24:28 +01:00
G-monitor
537d683dfb Add chinese translation 2017-03-02 17:46:10 +08:00
Palakis
e6f1b9f8c8 Travis: trying something 2017-03-02 01:08:57 +01:00
Palakis
5815d2bfce Lower minimum cmake version 2017-03-02 00:49:35 +01:00
Palakis
7692e93306 Travis: install Qt Websockets from source 2017-03-02 00:44:23 +01:00
Palakis
8768b83251 Added execute permission to Travis CI scripts 2017-03-02 00:29:36 +01:00
Palakis
35d18810fc Setting up Travis CI 2017-03-02 00:25:58 +01:00
Stéphane L
ccd40a1834 Update README.md 2017-03-01 23:29:13 +01:00
Palakis
5c1f0c3541 CI: Move cached deps outside of obs-studio source dir 2017-03-01 22:46:17 +01:00
Palakis
e237e52ae4 CI: Force Qt 5.7.0 like OBS Releases 2017-03-01 22:43:29 +01:00
Palakis
effec90528 More fixes for appveyor 2017-03-01 22:13:34 +01:00
Palakis
de4a2247c0 CI: Change MSVC version 2017-03-01 22:06:07 +01:00
Palakis
b20b7cbc98 Appveyor artifact name change 2017-03-01 22:02:06 +01:00
Palakis
3c347b9b77 Oops, typo 2017-03-01 21:50:20 +01:00
Palakis
794c4066d8 Refactored appveyor.yml 2017-03-01 21:49:42 +01:00
Palakis
8c8e3072a7 Fix appveyor artifact packaging 2017-03-01 21:45:40 +01:00
Palakis
228708eec4 Added update type SceneItemVisibilityChanged 2017-03-01 21:41:42 +01:00
Palakis
dcafaedaa8 What the hell happens with LibObs_DIR 2017-03-01 21:22:14 +01:00
Palakis
a85297f2c8 CI: Build artifact from obs-websocket release folder 2017-03-01 21:12:37 +01:00
Palakis
91f7450cbd CI Fix 2017-03-01 21:07:50 +01:00
Palakis
e7b074991d Fix appveyor CI + fix build script 2017-03-01 20:59:35 +01:00
Palakis
5f83ce2a28 Setting up Appveyor CI 2017-03-01 20:46:21 +01:00
Palakis
44af896dee Force C++11 on Linux 2017-03-01 17:53:44 +01:00
Palakis
9eaa9a98ee Use UTF-8 strings for the password 2017-03-01 15:42:38 +01:00
Stéphane L
629880cd58 Update README.md 2017-02-28 20:40:51 +01:00
Palakis
42266ed14f Fixes #17 2017-02-28 16:56:03 +01:00
Palakis
9dd7a197e4 Update PROTOCOL.md 2017-02-28 16:05:41 +01:00
Palakis
6f39da20a9 Removed TransitionEnd event + changed TransitionBegin triggering 2017-02-28 16:01:06 +01:00
Palakis
1ebb6f9257 Transition events + scene change compatibility with OBS 18.0.0 2017-02-28 15:40:40 +01:00
Palakis
e30e982ef0 Added update type TransitionDurationChanged 2017-02-27 13:24:25 +01:00
Palakis
42a80c6185 Ability to get and set transition duration 2017-02-27 11:53:44 +01:00
Stéphane L
0d495f4d65 Merge pull request #46 from mikhailswift/add_scene_name_to_other_source_commands
Add scene name to SetSceneItemPosition and SetSceneItemTransform
2017-02-27 00:08:06 +01:00
Mikhail Swift
71f5e66bd1 Added back accidental nuked new line 2017-02-26 18:03:20 -05:00
Mikhail Swift
a6f71b68f3 Update protocol.md 2017-02-26 18:02:46 -05:00
Mikhail Swift
a527f343cd Moved some repeated code to utils, added source_name to other commands 2017-02-26 18:01:09 -05:00
Stéphane L
f8e1c454d9 Merge pull request #45 from mikhailswift/toggle_source_on_specified_scene
Toggle source on specified scene
2017-02-26 23:24:02 +01:00
Mikhail Swift
da6e55f09f Used same error message elsewhere, fixed null check 2017-02-26 17:13:50 -05:00
Mikhail Swift
d277e2788a Fixed missed changes from currentScene -> scene 2017-02-26 16:40:29 -05:00
Mikhail Swift
53ba747b78 Update protocol readme for added parameter 2017-02-26 16:36:38 -05:00
Mikhail Swift
b9862acd1d Add scene-name optional parmeter to set source render command 2017-02-26 16:35:08 -05:00
Palakis
d1c19382a1 Fixes #34 2017-02-26 19:46:09 +01:00