763 commits

Author	SHA1	Message	Date
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