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 |
|
Thijs Wenker
|
388332966d
|
Added cloning methods to Grid3DOverlay
Added example script for cloning overlays (TODO: SpriteBillboard fix cloning of in example)
|
2014-11-13 22:22:46 +01:00 |
|
David Rowe
|
9e19641a1d
|
Add property getting for all 3D overlays
|
2014-11-12 21:05:44 -08:00 |
|
Ryan Huffman
|
2ebca0a659
|
Add Grid3DOverlay
|
2014-11-11 09:50:25 -08:00 |
|