David Rowe
|
d7866d9981
|
Rename previous Dialog to VrDialog
|
2015-06-06 10:48:07 -07:00 |
|
David Rowe
|
2c17274f49
|
Rename Dialog.qml to DialogOld.qml
|
2015-06-04 14:39:27 -07:00 |
|
Brad Davis
|
19ca543c2c
|
Cleaning up code and tweaking menu layout
|
2015-04-27 19:07:53 -07:00 |
|
Brad Davis
|
fd28baac8c
|
Working on message box and addressbar tweaks
|
2015-04-27 15:42:20 -07:00 |
|
Brad Davis
|
0b1df891af
|
Backporting visual work from branch
|
2015-04-27 10:53:58 -07:00 |
|
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
|
8cb298a55b
|
Working on menus
|
2015-04-23 14:23:15 -07:00 |
|
Brad Davis
|
d2ff89aaec
|
Cleaning up qml
|
2015-04-23 14:23:13 -07:00 |
|
Brad Davis
|
8269b9925b
|
Adding first pass at message box
|
2015-04-23 14:23:12 -07:00 |
|