Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 22:16:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24541 commits 71 branches 56 tags 1.2 GiB
Commit graph

9 commits

Author SHA1 Message Date
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Brad Davis
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
1ff8c67576 More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
Brad Davis
bb1c73adc7 Working on menus 2015-04-23 14:24:01 -07:00
Brad Davis
d2ff89aaec Cleaning up qml 2015-04-23 14:23:13 -07:00
Brad Davis
16efa2a46f Improving toggle visibility and loading behavior 2015-04-17 16:59:04 -07:00
Brad Davis
aba2b395a6 Working on testing the QML ui 2015-04-15 12:35:30 -07:00