820 Commits

Author SHA1 Message Date
Stéphane Lepin
ec7f3fa057 ci(macos): revert version change 2018-12-31 17:21:29 +01:00
Stéphane Lepin
5cfefd8b15 ci(docs): revert change 2018-12-31 17:19:24 +01:00
Stéphane Lepin
7e6b53311d import more changes from master 2018-12-31 17:18:07 +01:00
Stéphane Lepin
16bc68f2f9 server: import websockets++ server from master 2018-12-31 17:05:23 +01:00
Stéphane L
974d6b48b2 chore: 4.5.0 release 4.5.0 2018-12-30 21:02:56 +01:00
Travis CI
db2b1e2dc7 docs(travis): Update protocol.md - 98656b5 [skip ci] 2018-12-30 17:41:58 +00:00
Stéphane Lepin
98656b5d2f
Merge pull request #263 from Palakis/sceneitem-order
add SetSceneItemOrder from master
2018-12-30 18:40:55 +01:00
Stéphane L
3c7570d814 scenes: rename SetSceneItemOrder to ReorderSceneItems + fix item freeing 2018-12-30 14:47:59 +01:00
Travis CI
fc3e30a826 docs(travis): Update protocol.md - 2f0476b [skip ci] 2018-12-30 13:34:11 +00:00
Stéphane L
2f0476b43c docs: fix version + plugin name 2018-12-30 14:32:38 +01:00
Stéphane L
e310c7d744 move SetSceneItemOrder to Scenes 2018-12-24 18:34:18 +01:00
Stéphane L
8a649b89c8 scene items: import reorder method from master 2018-12-24 02:43:58 +01:00
Travis CI
95f52987ef docs(travis): Update protocol.md - 82b8c66 [skip ci] 2018-12-24 01:09:18 +00:00
Stéphane L
82b8c66d51 docs: fix branch name in generation script 2018-12-24 02:07:55 +01:00
Stéphane Lepin
83fb1843ee
Merge pull request #262 from Palakis/sources-methods-without-scene-name
sources: get rid of unnecessary `scene-name` param on Source Request Types
2018-12-24 00:33:19 +01:00
Stéphane Lepin
58b10069ab sources: fix issues 2018-12-24 00:10:45 +01:00
Stéphane Lepin
9cda739672 sceneitems: fix docs 2018-12-24 00:02:21 +01:00
Stéphane Lepin
276bba050b sources: nitpicking 2018-12-23 23:59:30 +01:00
Stéphane Lepin
147e49b362 sources + scene items: refactor + get rid of scene-name params 2018-12-23 23:54:25 +01:00
Stéphane Lepin
bc338c1f4a
Merge pull request #261 from Palakis/freetype2-source-properties
FreeType 2 Sources: Get/Set Properties
2018-12-23 23:04:52 +01:00
Stéphane Lepin
e8fbb18a71 sources(ft2): fix docs 2018-12-23 23:00:33 +01:00
Stéphane Lepin
682c349831 sources(ft2): simplified qstring compare 2018-12-23 18:30:27 +01:00
Stéphane Lepin
14b311f6ab sources(ft2): fix errors 2018-12-23 18:26:57 +01:00
Stéphane Lepin
8a40f355c8 sources: fix indents again 2018-12-23 18:21:31 +01:00
Stéphane Lepin
ae2f90c5c2 sources: fix indents 2018-12-23 18:20:45 +01:00
Stéphane Lepin
7aff773e2c sources: fix ft2 method indents 2018-12-23 18:19:29 +01:00
Stéphane Lepin
0cdfa6e7f6 sources: import ft2 methods + fix them 2018-12-23 18:16:44 +01:00
Stéphane Lepin
fc637eef6d
Merge pull request #254 from Lange/typedefs
docs: improve consistency of array typings; introduce typedefs category
2018-12-07 20:45:30 +01:00
Alex Van Camp
b4c3141170 wip: remove redundant "as object" descriptions 2018-12-05 14:02:25 -06:00
Stéphane Lepin
41257f7af5
Merge pull request #249 from PatTheMav/4.x-current
Fix compile error and added dependency check in build script
2018-12-04 14:29:53 -08:00
Alex Van Camp
b204f3ec90 wip: remove extraneous dash 2018-11-28 14:57:59 -06:00
Alex Van Camp
b4926b3535 docs: improve consistency of comment docs; introduce typedefs category 2018-11-27 17:49:54 -06:00
PatTheMav
77d63e9848
Added check for already installed packagesbuild 2018-11-08 21:29:39 +01:00
Stéphane Lepin
94dcd58c2e
Merge pull request #251 from Palakis/auth-without-mbedtls
auth: get rid of mbedtls
2018-11-08 19:01:13 +01:00
Stéphane Lepin
689ce16f1b config: use RNG compatible with QT < 5.10 2018-11-08 08:58:26 +01:00
Stéphane L
edc64b8336 auth: get rid of mbedtls 2018-11-08 00:52:26 +01:00
Stéphane L
03db5bfd8d bugfix(actual): TransitionBegin not triggered after switching scene collections (#250) 2018-11-07 21:13:13 +01:00
Stéphane Lepin
9ad340ab02 bugfix: TransitionBegin not emitted after scene collection change (#250) 2018-11-07 13:08:03 +01:00
Stéphane L
962e26040d ci(windows): build OBS with VS2015 2018-11-07 00:02:34 +01:00
Stéphane L
b07884c1da ci(win): use VS2015 to fix build errors
`constexpr function 'qCountLeadingZeroBits' cannot result in a constant expression`
2018-11-06 23:52:03 +01:00
Stéphane Lepin
bad0fb62ed
ci(windows): remove hardcoded image 2018-11-06 23:42:06 +01:00
Stéphane L
28e522ce97 WSRequestHandler: fix typo 2018-11-06 20:49:33 +01:00
Stéphane L
c206cdfa4c chore(release): version bump 2018-11-01 13:22:26 +01:00
Travis CI
c31ec077f5 docs(travis): Update protocol.md - afc6a60 [skip ci] 2018-11-01 12:15:56 +00:00
Stéphane Lepin
afc6a60746
Merge pull request #248 from RytoEX/4.3-fix-typos
general: Fix several typos throughout
2018-11-01 13:13:24 +01:00
Stéphane L
0a495b67e6 bugfix(requests): register DuplicateSceneItem and DeleteSceneItem 2018-11-01 13:00:07 +01:00
Ryan Foster
37ea7073d5 general: Fix several typos throughout 2018-11-01 00:42:02 -04:00
Stéphane Lepin
feaeef5a70
Merge pull request #246 from PatTheMav/4.4-macOS-build-update
4.4 macOS build system update
2018-10-30 14:58:17 +01:00
Stéphane Lepin
5586670d38 Utils: add missing scene item methods 2018-10-30 14:53:48 +01:00
PatTheMav
65a9139ffe
Fixes Travis builds for macOS
Switching to Xcode 9.4 achieves parity with obs-studio.
Also QT 5.10.1 is not available as a bottle for Sierra
anymore, which leads to Travis building qt from sources.

By enabling output of the qt install step, the "missing
output" timeout in Travis should be fixed as well, once
qt is not available for High Sieera anymore.
2018-10-24 19:39:32 +02:00