1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-25 20:22:39 +01:00
Commit Graph

50 Commits

Author SHA1 Message Date
Elias
c096be89cc Make import consistent from using 2.x -> 2.12 2019-02-15 12:07:29 +01:00
Elias
63f2d81489 Fixed recursive html copy *pikachu surprised face* 2018-12-16 18:09:37 +01:00
Elias
c22dcbd982 Fix an issue with autoplay with Qt 5.12 because of policy changes in Chrome autoplay 2018-12-15 21:32:17 +01:00
Elias
dbc23984b9 Add nicer error background 2018-12-15 21:30:59 +01:00
Elias
6cc6686691 Clean pro to use mac only feature only at one place 2018-12-15 21:30:41 +01:00
kelteseth
55a11b471a Merge remote-tracking branch 'origin/es/feature/convertVideo' into dev
# Conflicts:
#	ScreenPlay/Resources.qrc
#	ScreenPlay/main.cpp
#	ScreenPlay/qml/Create/CreateWallpaper.qml
#	ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
#	ScreenPlay/qml/Navigation.qml
#	ScreenPlay/src/create.cpp
#	ScreenPlayWidget/ScreenPlayWidget.pro
#	ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro
2018-12-04 13:25:03 +01:00
Dominik Louven
ef6dc7bc17 Fix video rendering for macOS 2018-11-27 18:53:30 +01:00
Dominik Louven
b0cd5bc984 Implement basic invoke of native Mac bridge wrapper for screenplay window 2018-11-27 11:34:09 +01:00
Dominik Louven
1b9e20eebf Add Mac qmake statements to .pro for native code compilation 2018-11-27 11:33:43 +01:00
Dominik Louven
79ac3477c9 Create MacIntegration wrapper class for macbridge 2018-11-27 11:31:17 +01:00
Dominik Louven
ba7d04c034 Add native Mac bridge code for window level settings 2018-11-27 11:31:00 +01:00
Dominik Louven
2b3c69c1c6 Create native Mac bridge files 2018-11-27 11:30:43 +01:00
Dominik Louven
cb10848ca6 Removed forcefully OpenGL 2018-11-26 22:31:07 +01:00
Dominik Louven
5d7e342131 Removed /opt/ dependency in pro file 2018-11-26 22:30:52 +01:00
Dominik Louven
9a97f19918 Fixed MacOS library paths 2018-11-26 20:37:48 +01:00
kelteseth
855c70273b Add 2018-11-17 11:54:59 +01:00
kelteseth
d647b28733 Add ScreenPlayWindow deploy 2018-11-11 17:56:35 +01:00
kelteseth
d0219191c0 Add html support 2018-09-21 16:25:31 +02:00
kelteseth
a2f6c82ee0 Add qml mute before destroy 2018-09-20 15:44:29 +02:00
kelteseth
2e89fda91f Fix linking of sdk 2018-09-20 15:43:08 +02:00
kelteseth
63caa6f3b2 Fix window fullscreening
Cleanup
2018-09-14 15:33:28 +02:00
kelteseth
3a06b38b23 Add webengine 2018-09-13 20:23:12 +02:00
kelteseth
a500911ad7 Add more video controls 2018-09-08 13:46:31 +02:00
kelteseth
c4c24a1ae8 Add playbackrate, message received and loops 2018-09-07 21:12:17 +02:00
kelteseth
3fc75239ef Add incomming message 2018-09-07 20:56:38 +02:00
kelteseth
c7e5f1f722 Restore qml wallpaper functionality 2018-09-06 15:54:55 +02:00
kelteseth
300f98aff0 Cleanup 2018-09-06 13:57:36 +02:00
kelteseth
e6d047f4c1 Add small curtain transition 2018-08-25 00:43:23 +02:00
kelteseth
324ab64637 Add working webm player. WARNING: THERE IS NO ERROR FOR PLAYING MP4 YET IMPLEMENTED! 2018-08-20 15:18:56 +02:00
kelteseth
893179f335 Qt qtquickcompiler 2018-07-29 17:56:14 +02:00
kelteseth
db6cad839e Add basic widget functionallity 2018-03-21 18:56:58 +01:00
kelteseth
9f51643c6a Add new slider and new configs 2018-03-15 16:00:55 +01:00
kelteseth
8232696446 Restore default configs for wallpaper creation 2018-03-14 13:58:57 +01:00
kelteseth
3d15948e54 Add explanation 2018-03-12 16:21:19 +01:00
kelteseth
025d6080ab Add working property transmission! 2018-03-12 15:23:03 +01:00
kelteseth
8b5b16a761 Fix merge mistakes 2018-03-12 12:30:07 +01:00
kelteseth
b196c45734 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	ScreenPlayWindow/src/SPWmainwindow.cpp
2018-03-12 11:17:58 +01:00
kelteseth
cfafbe6c7a Ad new third parameter to verifiy every window with an hash. 2018-03-12 11:07:45 +01:00
Elias Steurer
6be22d8f0b Add linux compatiblity 2018-03-11 22:33:33 +01:00
kelteseth
c906fd3009 Add scene wallpapers! 2018-02-23 11:56:36 +01:00
kelteseth
eeda0a7a12 Better animation 2018-02-22 16:31:20 +01:00
kelteseth
c5a9e06922 Add steam deployable version
No now use the same folder for ScreenPlay and ScreenPlayWindow because I gave up on setting the dll dir for ScreenPlayWindow. This means we cannot have two C++ classes with the same name :(
2018-02-22 15:22:10 +01:00
kelteseth
542096a518 Fix dll path 2018-02-22 12:09:07 +01:00
kelteseth
46d53f350a Fix release Window.exe path and comment out sdk output witch caused segfaults 2018-02-19 23:07:04 +01:00
kelteseth
c6694afa1a Add fade in and out transitions 2018-02-18 17:02:03 +01:00
kelteseth
c9522fba52 Fix video playing again 2018-02-18 16:46:47 +01:00
kelteseth
12fd518216 Add webm file format 2018-02-18 16:45:51 +01:00
kelteseth
b675c4dd97 Fix window positioning FINALLY 2018-02-14 10:21:15 +01:00
kelteseth
ad342fc258 Add new sdk project. ScreenPlay now uses an new process for every wallpaper and communicates via the official ScreenPlaySDK ! 2018-02-12 15:35:08 +01:00
kelteseth
569a65ab15 Moving the project into a subdir project 2018-01-31 21:54:25 +01:00