SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged master to brightness

Browse Source
This commit is contained in:
ykeara
2019-04-12 18:25:14 -05:00
parent e2e68ecc89 b32d621994
commit 9de14e20cb
34 changed files with 1059 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_scripts/qt/resources.pri
+5 -1
View File
@@ -32,7 +32,7 @@ DISTFILES += \
src/res/qml/utilities_page/* \
src/res/qml/utilities_page/media_keys/* \
src/res/qml/utilities_page/keyboard_utils/* \
src/res/qml/utilities_page/desktop_size/* \
src/res/qml/desktop_overlay_page/desktop_size/* \
src/res/qml/utilities_page/alarm_clock/* \
src/res/qml/audio_page/dialog_boxes/* \
src/res/qml/audio_page/device_selector/* \
@@ -42,5 +42,9 @@ DISTFILES += \
src/res/qml/video_page/* \
src/res/qml/video_page/brightness/* \
src/res/qml/common/* \
src/res/qml/desktop_overlay_page/* \
src/res/qml/desktop_overlay_page/translation_left_right/SteamDesktopTranslationLeftRight.qml \
src/res/qml/desktop_overlay_page/translation_back_forwards/SteamDesktopTranslationBackForwards.qml \
src/res/qml/desktop_overlay_page/translation_up_down/SteamDesktopTranslationUpDown.qml \
RC_FILE = src/res/icon.rc
build_scripts/qt/sources.pri
+10 -7
View File
@@ -13,11 +13,11 @@ SOURCES += src/main.cpp\
src/tabcontrollers/VideoTabController.cpp \
src/utils/ChaperoneUtils.cpp \
src/tabcontrollers/audiomanager/AudioManagerDummy.cpp \
src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp \
src/openvr/openvr_init.cpp \
src/openvr/ivrinput.cpp \
src/utils/setup.cpp \
src/utils/paths.cpp
src/utils/paths.cpp \
src/openvr/overlay_utils.cpp
HEADERS += src/overlaycontroller.h \
src/tabcontrollers/AudioTabController.h \
@@ -32,12 +32,11 @@ HEADERS += src/overlaycontroller.h \
src/tabcontrollers/VideoTabController.h \
src/tabcontrollers/AudioManager.h \
src/tabcontrollers/PttController.h \
src/tabcontrollers/KeyboardInput.h \
src/tabcontrollers/keyboardinput/KeyboardInput.h \
src/utils/Matrix.h \
src/utils/ChaperoneUtils.h \
src/quaternion/quaternion.h \
src/tabcontrollers/audiomanager/AudioManagerDummy.h \
src/tabcontrollers/keyboardinput/KeyboardInputDummy.h \
src/openvr/openvr_init.h \
src/openvr/ivrinput_action.h \
src/openvr/ivrinput_manifest.h \
@@ -45,13 +44,17 @@ HEADERS += src/overlaycontroller.h \
src/openvr/ivrinput_input_source.h \
src/openvr/ivrinput.h \
src/utils/setup.h \
src/utils/paths.h
src/utils/paths.h \
src/openvr/overlay_utils.h
win32 {
SOURCES += src/tabcontrollers/audiomanager/AudioManagerWindows.cpp \
src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp
HEADERS += src/tabcontrollers/audiomanager/AudioManagerWindows.h \
src/tabcontrollers/keyboardinput/KeyboardInputWindows.h
HEADERS += src/tabcontrollers/audiomanager/AudioManagerWindows.h
}
!win32 {
SOURCES += src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp
}
win32-msvc {