36 commits

Author	SHA1	Message	Date
SamGondelman	becc9f4f8d	DELETE IT ALL	2019-01-25 16:06:59 -08:00
Stephen Birarda	93530fca72	fix the last of the current override warnings for OS X	2016-02-03 11:08:41 -08:00
Brad Davis	5b817ccc21	Make all 2D overlays QML	2016-01-28 16:03:26 -08:00
Zander Otavka	da2afca391	Expose overlay type checking to JavaScript.	2015-07-31 11:26:04 -07:00
Brad Davis	35f7307f30	More header cleanup	2015-07-18 22:15:50 -07:00
Brad Davis	89faf85ad9	Working on text rendering overlays	2015-07-16 15:56:01 -07:00
David Rowe	215c260c9e	Fix TextOverlay font size setting	2015-06-30 17:08:43 -07:00
David Rowe	386b3d8ae3	Fix text overlay font rendering ... Use the same font size as used in TextRenderer to avoid scaling issues.	2015-06-27 14:02:49 -07:00
Atlante45	55c490043f	Restore InterfaceConfig.h includes	2015-06-24 16:13:42 -07:00
Atlante45	e3d22ef94b	Fix overlays getBounds + code cleanup	2015-06-24 16:13:42 -07:00
Atlante45	10c2f3f561	More TextRenderer work	2015-05-28 14:51:57 +02:00
Atlante45	9b49936d29	TextRenderer memory leak	2015-05-20 16:41:47 +02:00
David Rowe	abb62fd8f9	Fix typo found in passing	2015-03-10 10:57:48 -07:00
ZappoMan	912b851eb7	remove crufty references to QGLWidget	2015-02-25 12:54:34 -08:00
David Rowe	136c3a2cce	Replace 2D and 3D text overlay textWidth() method with textSize()	2014-12-09 18:32:53 -08:00
David Rowe	f5a1c26492	Add backgroundAlpha property to 2D and 3D text overlays	2014-12-05 11:08:00 -08:00
Thijs Wenker	38ed104397	added const to copy constructors	2014-11-15 00:21:50 +01:00
Thijs Wenker	ba5491bc8b	moved writeToClone to copy constructor	2014-11-14 22:55:25 +01:00
Thijs Wenker	fa4555a7a2	Merge branch 'master' of https://github.com/worklist/hifi into 20176 ... Conflicts: interface/src/ui/overlays/Grid3DOverlay.cpp interface/src/ui/overlays/ImageOverlay.cpp interface/src/ui/overlays/Line3DOverlay.cpp interface/src/ui/overlays/LocalVoxelsOverlay.cpp interface/src/ui/overlays/LocalVoxelsOverlay.h interface/src/ui/overlays/Overlay.h interface/src/ui/overlays/Overlay2D.cpp interface/src/ui/overlays/Text3DOverlay.cpp interface/src/ui/overlays/TextOverlay.cpp interface/src/ui/overlays/TextOverlay.h	2014-11-14 20:09:27 +01:00
David Rowe	8076bfea72	Merge branch 'master' into 20157 ... Conflicts: interface/src/ui/overlays/Text3DOverlay.cpp	2014-11-13 14:53:57 -08:00
David Rowe	6f4952c7d5	More consts	2014-11-13 12:25:15 -08:00
David Rowe	4fa5447c85	Add overlay getProperty() for text overlay "text" property	2014-11-12 12:13:57 -08:00
David Rowe	6cf833cf98	Add text overlay textWidth() method	2014-11-11 17:31:49 -08:00
Brad Hefta-Gaub	3a90e869d4	Revert "CR for Job #20140 - Add Overlays.getTextWidth"	2014-11-07 21:50:19 -08:00
David Rowe	7e6d616f20	Add text overlay textWidth() method ... Is accessible from JavaScript.	2014-11-07 08:58:31 -08:00
Thijs Wenker	709ad84933	added clone functionality to Overlays: ... Overlays.cloneOverlay(OverlayID)	2014-11-05 23:44:59 +01:00
ZappoMan	3e9bc23c2f	moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes	2014-10-29 10:19:04 -07:00
ZappoMan	bffd236640	add glowLevel, and pulse to all overlays	2014-09-29 16:44:40 -07:00
Clément Brisset	4f756c31f2	Merge pull request #3133 from huffman/19819 ... Code Review for Job #19819	2014-07-08 10:07:26 -07:00
Atlante45	598c1cb516	Switched Sound to NetworkAccessManager	2014-07-02 11:27:55 -07:00
Ryan Huffman	123773a8e3	Add default background color and initialize property	2014-06-30 12:20:05 -07:00
Ryan Huffman	cda88bf4af	Add backgroundColor to TextOverlay	2014-06-30 12:06:32 -07:00
Stojce Slavkovski	6365f6b857	Extend TextOverlay to accept font size ... Fix TextRenderer color rendering	2014-06-07 22:24:35 +02:00
Stephen Birarda	ae4b8348a2	fix header include guards via regex	2014-04-09 12:03:17 -07:00
Stephen Birarda	6a51df9e38	initial regex replacement of headers	2014-04-08 17:30:36 -07:00
ZappoMan	a56b7e341d	reorganize files in interface directory	2014-03-22 20:22:05 -07:00

Renamed from interface/src/ui/TextOverlay.h (Browse further)