65 commits

Author	SHA1	Message	Date
David Rowe	8076bfea72	Merge branch 'master' into 20157 ... Conflicts: interface/src/ui/overlays/Text3DOverlay.cpp	2014-11-13 14:53:57 -08:00
AndrewMeadows	b797c7b38c	Merge pull request #3782 from ctrlaltdavid/20140 ... CR for Job #20140 - Add Overlays.getTextWidth	2014-11-13 13:52:53 -08:00
David Rowe	6f4952c7d5	More consts	2014-11-13 12:25:15 -08:00
Thijs Wenker	14655870ec	Merge branch 'master' of https://github.com/worklist/hifi into 20176	2014-11-13 20:14:26 +01:00
David Rowe	9e19641a1d	Add property getting for all 3D overlays	2014-11-12 21:05:44 -08:00
David Rowe	8ac3aba2bd	Make text overlays apply alpha to text as well as background	2014-11-11 17:54:02 -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	d3d80d3fe2	filled in the rest of the properties	2014-11-06 00:34:59 +01: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	228de963ab	CR feedback	2014-10-21 12:28:44 -07:00
ZappoMan	1b9565e575	cleanup	2014-10-21 08:25:04 -07:00
ZappoMan	99adb413e3	add 3D text overlay support	2014-10-21 08:20:15 -07:00