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 |
|
Andrew Meadows
|
5ba213f8d1
|
fix for function override with no return
|
2014-11-14 09:33:11 -08:00 |
|
David Rowe
|
9e19641a1d
|
Add property getting for all 3D overlays
|
2014-11-12 21:05:44 -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
|
2004159778
|
implement basic support for planar overlay type intersections
|
2014-10-08 20:29:53 -07:00 |
|
ZappoMan
|
c3b0700601
|
introduce Planar3DOverlay for common features of rectangle and circle, introduced rectanglular 3D plane
|
2014-09-30 14:52:44 -07:00 |
|