86 commits

Author	SHA1	Message	Date
Brad Davis	1e90aaf9c3	Working on overlays still, mirror rendering and overlay order	2015-06-17 11:35:30 -07:00
Brad Davis	2bf53b625e	Working on overlays and stats	2015-06-17 02:00:13 -07:00
Brad Davis	4762e1a00c	Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp	2015-06-16 21:01:00 -07:00
Brad Davis	659fa2387c	Working on overlays / stats	2015-06-16 21:00:13 -07:00
Leonardo Murillo	7aee293df4	Buttons are connected and execting old functions	2015-06-08 14:56:46 -06:00
Leonardo Murillo	edce36f5a1	Checkpoint - buttons in place	2015-06-08 14:29:10 -06:00
Leonardo Murillo	bd85ce1312	Auto Update checkpoint - dialog is QML and populated with real data	2015-06-08 13:55:28 -06:00
Leonardo Murillo	83b7054138	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-08 11:55:47 -06:00
David Rowe	d7866d9981	Rename previous Dialog to VrDialog	2015-06-06 10:48:07 -07:00
David Rowe	bbde367386	Rename new Dialog to DialogContainer	2015-06-06 10:42:49 -07:00
Leonardo Murillo	68b419deec	Syncing	2015-06-05 17:11:32 -06:00
David Rowe	c7c355c19f	Remove circular login dialog variation	2015-06-05 15:37:25 -07:00
Leonardo Murillo	dea80d1757	Styling update dialog and working towards passing build details from c++ to qml	2015-06-05 16:17:54 -06:00
David Rowe	ee8449712c	Code review and tidying	2015-06-05 13:23:06 -07:00
David Rowe	7e9122e3d1	Replace login background SVGs with QML rectangles	2015-06-05 13:15:18 -07:00
David Rowe	f168385798	Add spinner in place of "Logging in..."	2015-06-05 12:57:40 -07:00
David Rowe	562228e924	Change login password recovery link text	2015-06-05 09:47:34 -07:00
David Rowe	37aefe73f8	Remove unnecessary semicolons	2015-06-05 09:07:07 -07:00
David Rowe	426fbc662a	White error text instead of black	2015-06-05 09:03:46 -07:00
David Rowe	6c7fb7e54c	Fix setting focus at start-up when not logged in	2015-06-05 09:02:35 -07:00
David Rowe	ce78a95dee	Make login dialog able to be dragged	2015-06-05 08:22:36 -07:00
David Rowe	0538eb5756	Add remainder of dialog content and polish look	2015-06-04 22:27:23 -07:00
David Rowe	3388406984	Add basic username, password, login, and error functionality and styling	2015-06-04 18:48:21 -07:00
David Rowe	afc2f374e5	New login dialog background with circular and rectangular variations ... Developer menu item toggles between the two.	2015-06-04 14:39:28 -07:00
David Rowe	d33a249b3e	Refactor common new dialog functionality into new Dialog.qml	2015-06-04 14:39:28 -07:00
David Rowe	2c17274f49	Rename Dialog.qml to DialogOld.qml	2015-06-04 14:39:27 -07:00
Leonardo Murillo	4f93328759	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-03 19:39:00 -06:00
Leonardo Murillo	b60597aa90	AutoUpdate is now a singleton invoked via Dependency Manager, first steps towards QML update notification	2015-06-03 19:38:54 -06:00
David Rowe	878227ab8b	Increase address bar dialog size ... Including font size, just for this dialog.	2015-06-02 16:33:09 -07:00
David Rowe	ec1cb72dd5	Rework QML font sizing to be more consistent across platforms	2015-06-02 14:49:33 -07:00
David Rowe	a8a3c677ad	Darken address bar hint text so that it's better visible on the DK2	2015-06-02 14:49:32 -07:00
David Rowe	7d12482a49	Untabify	2015-06-01 13:54:14 -07:00
David Rowe	9c52c79fe1	Combine icon and input areas into a single SVG	2015-06-01 13:29:36 -07:00
David Rowe	b166e24ff5	Fix initial fade-in	2015-06-01 11:06:33 -07:00
David Rowe	9a8bb67f37	Tidy address bar dialog code	2015-06-01 09:01:11 -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
David Rowe	05e251eba4	Add icon to address bar dialog	2015-06-01 09:01:10 -07:00
David Rowe	881941b64d	Restyle address bar dialog ... Made the dialog a stand-alone QML file that doesn't inherit from other dialog QML files so that don't need to rework all dialogs right now.	2015-06-01 09:01:09 -07:00
David Rowe	a43593c3b2	Dialog opacity transition tidying	2015-06-01 09:01:08 -07:00
David Rowe	2a931119bd	Replace expand/collapse dialog animation with fade in/out	2015-06-01 09:01:08 -07:00
Brad Davis	a8d343bbf1	Working on web entities	2015-05-13 00:27:57 -07:00
Brad Davis	e9b83e1c02	Working on web entities	2015-05-12 21:15:54 -07:00
Bradley Austin Davis	d2a8681139	Merge branch 'master' into infoview	2015-05-05 10:31:19 -07:00
Philip Rosedale	e9476029fb	Merge pull request #4724 from jherico/menu_polish ... Menu polish	2015-05-04 23:44:06 -07:00
Seth Alves	f75b599288	don't save default values in json file	2015-04-30 11:28:27 -07:00
Bradley Austin Davis	475c399d22	Menu polish on OSX	2015-04-29 02:54:47 -07:00
Brad Davis	87ef98005d	menu polish	2015-04-29 02:42:57 -07:00
Bradley Austin Davis	75f6ad3b99	Working on menus look	2015-04-29 00:43:18 -07:00
Brad Davis	0fb8884f9c	Merge branch 'browser' into infoview ... Conflicts: tests/ui/src/main.cpp	2015-04-28 17:54:04 -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