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
kelteseth
1d9b3b6497
Remove force opengl
2018-12-01 18:01:17 +01:00
kelteseth
855c70273b
Add
2018-11-17 11:54:59 +01:00
kelteseth
3a06b38b23
Add webengine
2018-09-13 20:23:12 +02:00
kelteseth
3fc75239ef
Add incomming message
2018-09-07 20:56:38 +02:00
kelteseth
300f98aff0
Cleanup
2018-09-06 13:57:36 +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
db6cad839e
Add basic widget functionallity
2018-03-21 18:56:58 +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
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
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
