Brad Davis
|
7bd8bbf565
|
Merge branch 'vr_menus' into infoview
|
2015-04-27 18:33:45 -07:00 |
|
Brad Davis
|
59b8b80148
|
Merge remote-tracking branch 'upstream/master' into vr_menus
Conflicts:
interface/src/Menu.cpp
|
2015-04-27 16:02:13 -07:00 |
|
Seth Alves
|
bdc6bb3c2d
|
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
|
2015-04-27 12:20:58 -07:00 |
|
Brad Davis
|
14b660baf7
|
Merge branch 'vr_menus' into infoview
Conflicts:
tests/ui/src/main.cpp
|
2015-04-27 11:43:49 -07:00 |
|
Brad Davis
|
76ce34a74b
|
Scanning for code style
|
2015-04-27 11:41:10 -07:00 |
|
Brad Davis
|
1a912787c2
|
Merge branch 'ui-refactor' into vr_menus
|
2015-04-27 11:05:14 -07:00 |
|
Brad Davis
|
a12bfd95f4
|
Merge remote-tracking branch 'upstream/master' into ui-refactor
Conflicts:
libraries/render-utils/src/MatrixStack.h
|
2015-04-27 10:59:57 -07:00 |
|
Seth Alves
|
b23427a3c8
|
hook up menu-items to control debug rendering of collision hulls and owned simulations
|
2015-04-27 10:32:47 -07:00 |
|
Brad Davis
|
b216689b45
|
Removing old infoview, testing new dialogs
|
2015-04-27 00:02:11 -07:00 |
|
Brad Davis
|
198224c4ec
|
Merge branch 'ui-refactor' into menu2
|
2015-04-25 16:48:05 -07:00 |
|
Brad Davis
|
7c16fd05c1
|
Merge branch 'master' into ui-refactor
|
2015-04-25 16:35:43 -07:00 |
|
Brad Davis
|
a96f69a673
|
Switching to a wrapper mechanism for VR menus
|
2015-04-25 16:20:15 -07:00 |
|
Seth Alves
|
b69cba1aba
|
respond to code-review
|
2015-04-25 10:50:18 -07:00 |
|
Brad Davis
|
ee30588fd4
|
More menu work
|
2015-04-25 10:41:06 -07:00 |
|
Seth Alves
|
0fb1a83e3b
|
quiet compiler, remove some trailing control-Ms
|
2015-04-25 09:20:00 -07:00 |
|
Atlante45
|
ba507cef98
|
Fix a few warnings
|
2015-04-25 11:01:02 +02: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
|
9fbd5d79e4
|
Removing duplicate declaration
|
2015-04-24 17:46:56 -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
|
c0d562ed55
|
Merge branch 'offscreen' into m_and_m
|
2015-04-23 23:45:11 -07:00 |
|
Brad Davis
|
8cb298a55b
|
Working on menus
|
2015-04-23 14:23:15 -07:00 |
|
Brad Davis
|
3ba0df5201
|
Fixing headers
|
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 |
|
Brad Davis
|
a9d65f168b
|
Working on marketplace dialog
|
2015-04-23 14:23:11 -07:00 |
|
Ryan Huffman
|
b31f95a002
|
Fix cube rendering not working with transparency
|
2015-04-23 09:34:23 -07:00 |
|
Brad Davis
|
eab4ad9ea9
|
More coding standard stuff
|
2015-04-22 20:16:41 -07:00 |
|
Brad Davis
|
732e9723cd
|
Messed up rename
|
2015-04-22 19:24:43 -07:00 |
|
Brad Davis
|
c4d2bd2cda
|
More coding standard fixes
|
2015-04-22 19:18:09 -07:00 |
|
Brad Davis
|
8d8c4babba
|
Coding standard fixes
|
2015-04-22 19:06:22 -07:00 |
|
Brad Davis
|
16efa2a46f
|
Improving toggle visibility and loading behavior
|
2015-04-17 16:59:04 -07:00 |
|
Brad Davis
|
fd0c130dc2
|
Working on simplifying new dialog creation
|
2015-04-16 22:20:49 -07:00 |
|
Brad Davis
|
ce6b7e7aec
|
Merge branch 'master' into offscreen
Conflicts:
interface/src/Menu.cpp
|
2015-04-16 14:02:40 -07:00 |
|
Brad Davis
|
aba2b395a6
|
Working on testing the QML ui
|
2015-04-15 12:35:30 -07:00 |
|
Brad Davis
|
d14d5f3d29
|
Working on new-UI implementations of address bar and login
|
2015-04-15 00:36:04 -07:00 |
|
ZappoMan
|
ae16bab7c2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
|
2015-04-14 13:13:15 -07:00 |
|
ZappoMan
|
174e9f2133
|
more tweaks to preferences UI
|
2015-04-14 12:38:29 -07:00 |
|
ZappoMan
|
9262585bab
|
first cut at moving avatar appearance into separate dialog box
|
2015-04-14 10:38:22 -07:00 |
|
Thijs Wenker
|
cf403a7ad8
|
Merge branch 'master' of https://github.com/worklist/hifi into 20367
|
2015-04-09 23:47:20 +02:00 |
|
Thijs Wenker
|
0cb5ee5bd1
|
- Scripts JS object renamed to ScriptDiscoveryService.
- Renamed Example script file for the ScriptDiscoveryService.
- Moved ScriptDiscoveryService functions to the RunningScriptWidget
|
2015-04-09 23:46:49 +02:00 |
|
Clément Brisset
|
36631dd3a3
|
Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting
CR for Animation fixes
|
2015-04-09 11:39:13 +02:00 |
|
Brad Davis
|
9b34003e2d
|
Merge pull request #4599 from Atlante45/fix_quit_vrmode_on_close
Quit VRMode before aboutToQuit runs
|
2015-04-07 17:06:29 -07:00 |
|
Brad Davis
|
c1a1157df9
|
Merge branch 'master' into menu
|
2015-04-07 14:41:17 -07:00 |
|
David Rowe
|
670d455b90
|
Fix manually entered attachment model URL not being used
|
2015-04-07 13:47:37 -07:00 |
|
David Rowe
|
ccf3afadfb
|
Fix manually entered joint mask value not being applied
|
2015-04-07 13:43:58 -07:00 |
|
David Rowe
|
082a9196ff
|
Fix manually entered animation URL not being able to be started
|
2015-04-07 13:43:04 -07:00 |
|
Andrew Meadows
|
a47170b02c
|
Merge pull request #4601 from samcake/temp1
Introducing gpu::State and using it in the Model rendering path and more...
|
2015-04-07 12:48:42 -07:00 |
|
Atlante45
|
5e3ed1c8e4
|
Compute correct mouse position
|
2015-04-07 17:15:16 +02:00 |
|
Atlante45
|
1cc4384404
|
Add new frame of reference for cursor
|
2015-04-07 17:13:30 +02:00 |
|