Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-21 17:43:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86817 commits 23 branches 28 tags 1.2 GiB
Commit graph

783 commits

Author SHA1 Message Date
Dante Ruiz
4a5be4238e messages and file dialogs in tablet 2017-02-24 00:19:32 +00:00
Dante Ruiz
3ba605bf23 saving work 2017-02-23 00:28:30 +00:00
Anthony J. Thibault
ed11edad56 EventBridge support 2017-02-15 13:59:04 -08:00
Anthony J. Thibault
912e8aa04a Tablet buttons now work in toolbar. 
Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.
 2017-02-14 15:37:24 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Anthony J. Thibault
432bb27119 The tablet Help button should be active if window is visible 2017-01-23 18:37:08 -08:00
Dante Ruiz
30b57b62da toggle help 2017-01-19 08:12:49 -08:00
Atlante45
ff3f175fb7 Fix typos 2017-01-17 15:39:54 -08:00
Dante Ruiz
2fc76d64fd clean up unused code and files 2017-01-10 09:13:46 -08:00
Dante Ruiz
6705846518 clean up round 1 2017-01-10 09:13:46 -08:00
Dante Ruiz
6c51edec77 added context menu to tablet 2017-01-10 09:13:45 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
David Rowe
9b270834dd Merge branch 'master' into 21089 2016-11-16 08:51:48 +13:00
David Rowe
1eeec2a3a1 Fix up script injection methods 2016-11-15 10:24:38 +13:00
David Rowe
e7d9f98ca4 Get script injection working in new marketplaces window 2016-11-15 09:23:51 +13:00
howard-stearns
4d18a3cc3d expose menu enablement to javascript 2016-11-10 15:01:06 -08:00
David Rowe
5eff7c9e15 Merge branch 'master' into 21089 2016-11-10 14:42:21 +13:00
Dante Ruiz
4b087a2718 fixed unable to remove menus from vrmenu context 2016-11-08 12:03:53 -08:00
Dante Ruiz
7f355c48b1 saving work progress 2016-11-08 12:03:53 -08:00
David Rowe
d33ac21aaa Merge branch 'master' into 21089 2016-11-08 08:23:10 +13:00
Clément Brisset
00a94bdd6d Merge pull request #8974 from huffman/feat/help-select-xbox-tab 
Update help window to auto select xbox or vive controller tab on availability of device
 2016-11-03 14:42:23 -07:00
howard-stearns
3a072b5bf9 tell desktop about preference changes 2016-11-03 12:17:28 -07:00
David Rowe
8ccf645d1c Make script event bridge available to OverlayWindow 2016-11-02 21:41:06 +13:00
Ryan Huffman
16d91833e8 Add optional url query to InfoView 2016-11-01 13:43:32 -07:00
Ryan Huffman
5b58e8ae97 Fix ConnectionHandler not handling connected-but-need-auth condition 2016-10-24 10:44:33 -07:00
Stephen Birarda
18523558f7 move HFWebEngineProfile back to interface/networking 2016-10-18 20:04:11 -07:00
Stephen Birarda
9f2627d31d Merge pull request #8828 from birarda/web-engine-interceptor 
move HF access token to authorization header
 2016-10-18 17:24:58 -07:00
Stephen Birarda
f8e0d7ad88 move QWebEngine classes to ui library 2016-10-18 12:53:32 -07:00
Stephen Birarda
b4b5c648c2 use a QWebEngineProfile request interceptor for auth in HTTP header 2016-10-17 11:34:37 -07:00
Howard Stearns
baea0f5cb0 create a directory chooser that works in hmd, and use it 2016-10-16 17:27:51 -07:00
Howard Stearns
3a294e77d4 Merge pull request #8745 from huffman/feat/new-help-window 
Update the help window
 2016-10-07 10:01:47 -07:00
David Rowe
1a745094e2 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
 2016-10-06 09:29:09 +13:00
David Kelly
621e3fc000 Expose triggerOption to scripts, plus _physicsEnabled 
Now any menu item can be triggered.  Plus you can do a
Window.isPhysicsEnabled to detect when we are done loading assets and
such.  Whee!
 2016-09-30 09:06:17 -07:00
David Rowe
5e842843c6 Set alphabetic/numeric keyboard per field entered 2016-09-30 11:54:32 +13:00
David Rowe
2344d15dbc Raise and lower keyboard for HTML fields in Marketplace window 2016-09-28 16:41:01 +13:00
Brad Davis
20deae3242 Working on Qt 5.6 compatibility 2016-09-06 17:35:04 -07:00
Brad Davis
617633b85c Moving to custom context creation 2016-08-29 11:21:54 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Brad Davis
f819e98d94 Fix menu so that functions indirectly triggered by menu scanning don't inherit the menu group 2016-08-12 22:28:40 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
Zander Otavka
43bbe790d6 Add atp support to qml 2016-08-08 15:12:17 -07:00
Anthony J. Thibault
713bee84c3 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-03 14:06:43 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling 
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
 2016-08-03 10:20:15 -07:00
Seth Alves
cc7322a0de Merge pull request #8334 from ctrlaltdavid/21015 
refresh file dialog when directory content changes
 2016-08-03 08:11:40 -07:00
Brad Hefta-Gaub
193f0bbb99 Merge pull request #8345 from ctrlaltdavid/web-window-signals 
add OverlayWebWindow resized, moved, and closed signals
 2016-08-02 18:41:49 -07:00
Zander Otavka
38ba54e481 Fix confirm dialog 2016-08-02 16:04:54 -07:00
David Rowe
31ac7a2812 Add OverlayWebWindow resized, moved, and closed signals 2016-08-02 12:40:01 +12:00
David Rowe
800c2b9ec0 Refresh file dialog when directory content changes 2016-07-30 11:21:40 +12:00
Andrew Meadows
5ce681154d Merge pull request #8301 from AlexanderOtavka/asset-browser-ui 
Asset browser ui
 2016-07-26 15:04:10 -07:00
Brad Hefta-Gaub
43064807d1 Merge pull request #8292 from jherico/webui 
Fix some UI elements triggered by WebViews
 2016-07-23 13:47:04 -07:00
Zander Otavka
530e17a7e5 Move JSON parsing for custom dialog to be sooner 2016-07-22 17:14:45 -07:00
Brad Davis
faba1a4b4e Fix UI elements triggered by WebViews 2016-07-21 15:13:07 -07:00
Zander Otavka
acf4539f4f Return a JSON string from QML instead of JS object 
Idk why QML can't return a JS object, but it can't.  Strings work, so I
use a string.
 2016-07-19 13:21:08 -07:00
Zander Otavka
c27e1d6fdb Polish dialog behavior and spacing 2016-07-15 17:35:55 -07:00
Zander Otavka
71f62c02fc Add basic implementation of customPrompt 
Still missing the warning and diabling of dynamic checkbox when the
static mesh is selected.
 2016-07-15 17:35:55 -07:00
Brad Davis
882139ebcf Allow scripts to override the navigation focus state set by QML dialogs 2016-07-14 12:10:46 -07:00
Ryan Huffman
575d693a3c Change default InfoView window width from 720 to 1024 2016-07-09 04:22:48 -07:00
Brad Davis
1f451269cd Allow scripts to receive a visibility changed signal from their windows 2016-06-30 13:22:01 -07:00
howard-stearns
6a1dd235c9 Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui 2016-06-24 12:49:54 -07:00
Brad Davis
a095da31fd Fix initial visibility of QML windows from scripts 2016-06-24 11:48:55 -07:00
howard-stearns
f8391f0062 fix reticle bugs 2016-06-23 16:51:15 -07:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00
Brad Davis
1f2f9da019 fix keys getting stuck 2016-05-22 23:34:45 -07:00
Brad Hefta-Gaub
ac15097f47 Merge pull request #7834 from huffman/feat/user-agent-plugins 
Add system information to UserAgent in AccountManager requests
 2016-05-19 11:53:14 -07:00
Zach Pomerantz
87b102ae0f Fix -Wunused-result from invokeResult 2016-05-18 18:19:44 -07:00
Zach Pomerantz
2c9b0f7233 Rm failing VrMenu assertion 2016-05-18 17:31:47 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Brad Hefta-Gaub
de17834dd1 Merge pull request #7740 from ctrlaltdavid/20887 
Don't display "Reveal Scripts Folder" control in HMD mode
 2016-04-22 13:04:07 -07:00
David Rowe
a7b82e8cae Decouple ui and shared libraries 2016-04-22 12:58:47 +12:00
Brad Hefta-Gaub
0f966e934e Merge pull request #7728 from ctrlaltdavid/20887 
Add link in Running Scripts that opens scripts folder
 2016-04-21 16:01:52 -07:00
David Rowe
9c9bca546c Add button that opens scripts directory window 2016-04-21 11:52:03 +12:00
howard-stearns
0544bcaacd Simpler cross-platform solution, with comments. 2016-04-20 15:02:41 -07:00
David Rowe
8f6cfb72ea Fix QML warnings at shutdown 2016-04-16 15:23:41 +12:00
Brad Davis
dfc1d896cd Fix shutdown crash 2016-04-12 11:49:55 -07:00
Brad Davis
4b02e8437c Fix menu items created by plugins 2016-04-12 11:15:06 -07:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd 
Disable gradient QML items on AMD
 2016-04-12 08:32:57 -07:00
Zach Pomerantz
ab72d8d8fb Init QML GL from share context 2016-04-11 13:47:45 -07:00
Brad Davis
7827c0f6f6 Suppress key release events for presses that were absorbed by QML 2016-04-08 17:09:11 -07:00
Brad Hefta-Gaub
cef599eaed Merge pull request #7586 from zzmp/log/failed-menu 
Log failed MenuUserData::forObject
 2016-04-06 19:44:05 -07:00
Zach Pomerantz
91126037e0 Fix showDesktop SIGNAL 2016-04-05 14:59:54 -07:00
Zach Pomerantz
6bcfeccdd8 Log failed MenuUserData::forObject 2016-04-05 14:59:52 -07:00
Brad Davis
ca67c7335f Fix passing of simple string message types from QML to scripts 2016-04-01 11:04:01 -07:00
Brad Davis
27406f5b21 Add texture stress test 2016-03-31 15:13:04 -07:00
Brad Davis
5343dfef24 PR feedback on 7480 2016-03-28 10:19:38 -07:00
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge" 
This reverts commit a43fde0803.
 2016-03-25 09:48:25 -07:00
Brad Davis
a43fde0803 Build a better event bridge 2016-03-24 11:01:06 -07:00
Brad Davis
8bbabf186f Fix async issues related to JS / QML object lifetimes 2016-03-24 09:38:54 -07:00
Brad Hefta-Gaub
8c290ea6b9 Merge pull request #7390 from Atlante45/feat/udp-flood-protection 
Server side bandwidth dial
 2016-03-23 11:47:41 -07:00
Brad Davis
28f25489f8 Fix occasional crash on creating overlay tool windows 2016-03-21 19:17:31 -07:00
Atlante45
6d2498b4f2 Remove debug print 2016-03-21 14:50:18 -07:00
Brad Davis
798d2a73db Merge pull request #7326 from ZappoMan/toggleOverlay 
Various Overlay, Menu, and Away Mode bug fixes
 2016-03-13 11:44:19 -07:00
David Rowe
9da64e540d Add shortcut keys to HMD menu 2016-03-12 12:53:16 +13:00
David Rowe
ecf67282d5 Add separators to HMD menus 2016-03-12 12:29:52 +13:00
Brad Hefta-Gaub
18f5b14e7a make all toggle menu items work properly through Menu scripting interface 2016-03-11 11:45:29 -08:00
Brad Davis
6d090895b7 Don't crash on QML menu creation failure 2016-03-09 14:48:20 -08:00
Brad Davis
d428f3b96f Working on crash bugs 2016-03-09 14:00:05 -08:00
Brad Davis
6e24b66b38 Fix edit.js upload button 2016-03-09 12:21:31 -08:00
Seth Alves
efdef52081 Merge pull request #7269 from ctrlaltdavid/20822 
Restyle bookmark dialogs
 2016-03-09 07:31:15 -08:00
David Rowe
10e4e5e3a7 Use OffscreenUI icon enum instead of QMessageBox icon enum 2016-03-09 11:33:55 +13:00
David Rowe
03fb6b1444 Add ability to have icons in query dialogs 
Add icon to bookmark dialogs' titles.
 2016-03-09 10:45:14 +13:00
Brad Hefta-Gaub
50eb07d465 Merge pull request #7221 from jherico/threaded_compositing2 
Migrate composition of the overlay and pointer to the present thread
 2016-03-08 10:22:02 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
Brad Davis
4e1f78b585 Allow message passing from a script to a QML window 2016-03-04 13:11:08 -08:00
Brad Hefta-Gaub
6b427e59ae show the overlays when the context menu is shown 2016-02-26 10:12:23 -08:00
Brad Davis
4074ba172d Fix window confirmation dialog 2016-02-23 20:37:25 -08:00
Brad Davis
b63e4b9d1f Address shutdown crash 2016-02-23 18:15:29 -08:00
Brad Davis
160a107bbd Auto-unhide the desktop when showing or raising a window 2016-02-22 19:36:00 -08:00
Brad Hefta-Gaub
0d873c7732 consolidate all calls to QCursor::pos() and QCursor.setPosition() to use common ControllerScriptingInterface 2016-02-15 16:11:25 -08:00
Brad Davis
28f3e8ba9c Don't leave user data pointers around in objects after deletion 2016-02-12 12:07:23 -08:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Bradley Austin Davis
dc0e038535 Add drive selection to the file dialog 2016-02-04 13:51:43 -08:00
Bradley Austin Davis
64597f9d9f Fixing save dialog issues saving new files 2016-02-04 13:32:52 -08:00
Bradley Austin Davis
60d97c45af Support save file dialog 2016-02-03 14:51:10 -08:00
Bradley Austin Davis
0a99086617 Moving to QML based dialogs 2016-02-03 14:51:02 -08:00
Bradley Austin Davis
f24f2749e1 Make users.js show QML window for edit friends 2016-02-02 15:19:12 -08:00
Bradley Austin Davis
2c26b32341 Make QML based tool-windows close properly 2016-02-02 12:00:58 -08:00
Brad Davis
c80193635b Update input dialog to support choice selection 2016-01-28 21:19:21 -08:00
Brad Davis
1324525ecc Make file dialog compatible with QFileDialog::getOpenFile 2016-01-28 15:50:57 -08:00
Brad Davis
940b095013 Removing menu logspam 2016-01-26 16:59:37 -08:00
Brad Davis
5f38c5265c Fixing potential crash in dialog popups 2016-01-26 16:59:19 -08:00
Brad Davis
bbefafcb07 Break up preferences dialogs 2016-01-23 23:11:41 -08:00
Brad Davis
208d7c3cfc Killing the old preferences dialog 2016-01-22 19:24:38 -08:00
Brad Davis
858bbbf987 Adding OffscreenUI API for QInputDialog functionality 2016-01-22 17:31:03 -08:00
Brad Davis
c7186590ea Support for directory browsing 2016-01-22 17:30:09 -08:00
Brad Davis
89b8eb2efa Fix initial keyboard focus problems 2016-01-22 13:41:06 -08:00
Brad Davis
3e7f29a0aa Support debug mode for QML UI in debug builds 2016-01-21 15:15:16 -08:00
Brad Davis
d2900200a1 More cleanup & menu fixing 2016-01-20 11:23:56 -08:00
Brad Davis
5aa8398adb Working on keyboard focus issues 2016-01-17 20:56:07 -08:00
Brad Davis
cf8d2c5182 Integrate file open dialog into running scripts dialog 2016-01-15 23:53:37 -08:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
Brad Davis
bb02a1eda2 Fix JS web window crash caused by race condition 2016-01-15 14:45:40 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Brad Davis
21534cbde0 Layout for running scripts 2016-01-12 12:40:42 -08:00
Brad Hefta-Gaub
a78d5274e7 Merge pull request #6780 from jherico/z_order 
Address some z-ordering issues in overlay windows
 2016-01-06 20:08:52 -08:00
Brad Hefta-Gaub
8b9c2cde63 fix warnings 2016-01-06 15:29:05 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Brad Hefta-Gaub
927fe97359 migrate callers of QMessageBox::warning() to OffscreenUi::warning() 2016-01-05 10:17:16 -08:00
Brad Hefta-Gaub
d98c2d1413 migrate callers of QMessageBox::question() to OffscreenUi::question() 2016-01-05 09:39:39 -08:00
Brad Davis
67e32cc1f0 Consolidating URL handling, exposing to all QML objects 2015-12-31 14:14:48 -08:00
Brad Davis
462cc325e5 Cleanup, moving some QML objects to OffscreenUI 2015-12-31 12:39:56 -08:00
Brad Davis
af132e267f Support a 'nav focus' state to allow joystick / hydra navigation of UI 2015-12-30 17:13:20 -08:00
Brad Davis
f4bd2afc8e Make script launched windows invisible at creation time 2015-12-30 11:38:34 -08:00
Brad Davis
0901e3aae1 Support QML and Web content in overlay windows 2015-12-30 09:14:49 -08:00
Brad Davis
95c524fba1 Fixing authentication token for followed links 2015-12-21 15:44:35 -08:00
Brad Davis
6ef77bc46a Support the marketplace in QML 2015-12-21 11:34:03 -08:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
Brad Davis
88b88a3306 Fixing warnings 2015-12-18 14:32:35 -08:00
Brad Davis
08a087c5aa PR comments 2015-12-18 11:19:01 -08:00
Brad Davis
5088eec2a2 Move directory web UI into the overlay 2015-12-17 12:23:39 -08:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Brad Hefta-Gaub
2815cb0fef first cut at adding advanced and developer menu groupings 2015-12-12 18:12:36 -08:00
David Rowe
d6b13ef42c Fix crash when try to remove invalid menu item in JavaScript 2015-11-30 08:33:38 +13:00
Brad Hefta-Gaub
a149a2dd60 fix some warnings 2015-10-30 00:19:14 -07:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Stephen Birarda
695f0a75b0 fixes for builds with qt 5.5 2015-10-22 11:12:51 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Brad Davis
0aaa07a2de Remove items from the QML version of the menu when they are removed from the main menu 2015-08-25 19:05:29 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Brad Davis
0fa3044231 QML framerate improvments 2015-08-12 16:24:34 -07:00
Bradley Austin Davis
fda1cb6f7b Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 08:59:29 -07:00
Brad Davis
c0859ffd4c Removing some dead forward declarations 2015-07-20 14:33:10 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Brad Davis
1c8ec3b1c9 preventing unused warnings 2015-07-14 10:16:06 -07:00
Brad Davis
29333d0cad Qt5.5 fixes 2015-07-12 18:52:15 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Brad Davis
5cfa22396c Merge pull request #5219 from venkatn93/master 
Changing tooltip reticle
 2015-06-29 10:51:16 -07:00
Niraj Venkat
fe8d539cf5 changing link icon 2015-06-26 16:27:04 -07:00
Stephen Birarda
a0df52e860 add note for UI link 2015-06-26 14:17:54 -07:00
Stephen Birarda
7e19a540fd add the new placeholder image 2015-06-26 14:13:23 -07:00
Stephen Birarda
18e2b62ecc initial image replacement for hyperlink preview 2015-06-26 14:12:26 -07:00
Stephen Birarda
522b715628 remove comment, styling cleanup 2015-06-26 11:41:34 -07:00
Stephen Birarda
c6df573933 fix some OS X warnings, add description to tooltip 2015-06-26 10:50:31 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Brad Davis
659fa2387c Working on overlays / stats 2015-06-16 21:00:13 -07:00
Brad Davis
09cfe004a1 Combining with new cursor render code 2015-06-11 16:55:23 -07:00
Brad Davis
ca1af77763 Working on cursor manager 2015-06-10 13:24:56 -07:00
Brad Davis
873f73ffb4 Working on cursor manager 2015-06-09 00:39:49 -07:00
David Rowe
e41b4c1b7b Add new address bar dialog error message 
Implemented as a new simple InformationDialog so that can try it out
without reworking MessageDialog immediately for all QML UI.
 2015-06-01 09:01:11 -07:00
Brad Davis
9b6c20d93c Merge remote-tracking branch 'upstream/master' into web-entity 2015-05-13 09:49:53 -07:00
Brad Davis
e9b83e1c02 Working on web entities 2015-05-12 21:15:54 -07:00
Brad Davis
745182a963 Working on web entities 2015-05-12 14:39:54 -07:00
Bradley Austin Davis
14efe912a6 Because sometimes I just don't think things through 2015-05-12 09:20:02 -07:00
Brad Davis
c0fc0a226b Fixing info-view popup on every launch 2015-05-11 13:10:36 -07:00
Bradley Austin Davis
c31d36be59 Fixing scale resolution issues 2015-05-07 12:01:56 -07:00
Brad Davis
a9de502e76 removing commented out old implementation. 2015-05-06 12:03:47 -07:00
Bradley Austin Davis
fbee3c1782 Clearing a GL error from Qt internals that triggers an assert 2015-05-05 10:49:12 -07:00
Bradley Austin Davis
d2a8681139 Merge branch 'master' into infoview 2015-05-05 10:31:19 -07:00
Seth Alves
0341caad95 quiet compiler 2015-05-03 11:10:52 -07:00
Brad Davis
9836ffed97 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-28 01:17:51 -07:00
Brad Davis
b0eccc40c2 Fix crash cause when Menu::instance() is before offscreen ui startup 2015-04-27 22:58:09 -07:00
Brad Davis
19ca543c2c Cleaning up code and tweaking menu layout 2015-04-27 19:07:53 -07:00
Brad Davis
7bd8bbf565 Merge branch 'vr_menus' into infoview 2015-04-27 18:33:45 -07:00
Bradley Austin Davis
ca16d37ce5 Mac testing 2015-04-27 12:46:34 -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
d55d467d3f Tweaking VR menu for PR 2015-04-27 11:35:57 -07:00
Brad Davis
b216689b45 Removing old infoview, testing new dialogs 2015-04-27 00:02:11 -07:00
Brad Davis
3032b1fb67 Merge branch 'ui-refactor' into vr_menus 2015-04-26 20:14:04 -07:00
Brad Davis
4740674da2 Merge branch 'ui-refactor' into infoview 2015-04-26 20:11:54 -07:00
Brad Davis
3071be162a Coding standards 2015-04-26 20:11:27 -07:00
Brad Davis
aafecae4b5 Coding standards 2015-04-26 20:10:22 -07:00
Brad Davis
fa31ba0754 Info-view 2015-04-26 10:37:14 -07:00
Brad Davis
d4d469b881 Adding note to change filename 2015-04-25 20:13:59 -07:00
Brad Davis
b77b3e4f3d Merge branch 'ui-refactor' into menu2 2015-04-25 17:00:07 -07:00
Brad Davis
2e61b5a933 Coding standards 2015-04-25 16:59:43 -07:00
Brad Davis
198224c4ec Merge branch 'ui-refactor' into menu2 2015-04-25 16:48:05 -07:00
Brad Davis
0afe8c0e32 Coding standards 2015-04-25 16:46:05 -07:00
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -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
9fbd5d79e4 Removing duplicate declaration 2015-04-24 17:46:56 -07:00
Brad Davis
fdf2f8395d Bad lambda type 2015-04-24 17:28:43 -07:00
Brad Davis
eb02bdc67f Dangling function 2015-04-24 16:57:39 -07:00
Brad Davis
dab8761c71 Merge remote-tracking branch 'upstream/master' into ui-refactor 2015-04-24 16:46:48 -07:00
Brad Davis
e7b8efc2d9 Cleaning up unused stuff 2015-04-24 16:44:48 -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
1d316a1872 Still working on menus 2015-04-23 23:41:09 -07:00
Brad Davis
f17387fab4 Working on menus 2015-04-23 21:23:21 -07:00
Brad Davis
bb1c73adc7 Working on menus 2015-04-23 14:24:01 -07:00
Brad Davis
9a8207610d Bad merge 2015-04-23 14:23:15 -07:00
Brad Davis
8cb298a55b Working on menus 2015-04-23 14:23:15 -07:00