overte-HifiExperiments/interface/src/ui/overlays
David Rowe 8076bfea72 Merge branch 'master' into 20157
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
2014-11-13 14:53:57 -08:00
..
Base3DOverlay.cpp Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Base3DOverlay.h Add position vector and color object script value examples 2014-11-12 14:33:52 -08:00
BillboardOverlay.cpp Refactor QRect conversion to QScriptValue 2014-11-12 21:32:55 -08:00
BillboardOverlay.h Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Circle3DOverlay.cpp Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Circle3DOverlay.h Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Cube3DOverlay.cpp 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
Cube3DOverlay.h 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
Grid3DOverlay.cpp Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Grid3DOverlay.h Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
ImageOverlay.cpp Refactor QRect conversion to QScriptValue 2014-11-12 21:32:55 -08:00
ImageOverlay.h Add property getting for all 2D overlays 2014-11-12 16:50:13 -08:00
Line3DOverlay.cpp Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Line3DOverlay.h Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
LocalModelsOverlay.cpp 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
LocalModelsOverlay.h 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
LocalVoxelsOverlay.cpp Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
LocalVoxelsOverlay.h Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
ModelOverlay.cpp Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
ModelOverlay.h Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Overlay.cpp Add property getting for all 2D overlays 2014-11-12 16:50:13 -08:00
Overlay.h Add position vector and color object script value examples 2014-11-12 14:33:52 -08:00
Overlay2D.cpp Refactor QRect conversion to QScriptValue 2014-11-12 21:32:55 -08:00
Overlay2D.h Add overlay getProperty() for text overlay "text" property 2014-11-12 12:13:57 -08:00
Overlays.cpp Merge branch 'master' into 20157 2014-11-13 14:53:57 -08:00
Overlays.h Merge branch 'master' into 20157 2014-11-13 14:53:57 -08:00
Planar3DOverlay.cpp Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Planar3DOverlay.h Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Rectangle3DOverlay.cpp 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
Rectangle3DOverlay.h 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
Sphere3DOverlay.cpp 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
Sphere3DOverlay.h 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
Text3DOverlay.cpp Merge branch 'master' into 20157 2014-11-13 14:53:57 -08:00
Text3DOverlay.h Merge branch 'master' into 20157 2014-11-13 14:53:57 -08:00
TextOverlay.cpp Merge branch 'master' into 20157 2014-11-13 14:53:57 -08:00
TextOverlay.h Merge branch 'master' into 20157 2014-11-13 14:53:57 -08:00
Volume3DOverlay.cpp Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Volume3DOverlay.h Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00