Atlante45
|
55c490043f
|
Restore InterfaceConfig.h includes
|
2015-06-24 16:13:42 -07:00 |
|
Atlante45
|
233d92c315
|
Some code cleanup
|
2015-06-24 15:44:47 -07:00 |
|
Atlante45
|
c22f1aa7e1
|
Overlay2D return correct getBounds
|
2015-06-24 15:44:46 -07:00 |
|
ZappoMan
|
912b851eb7
|
remove crufty references to QGLWidget
|
2015-02-25 12:54:34 -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
|
4fa5447c85
|
Add overlay getProperty() for text overlay "text" property
|
2014-11-12 12:13:57 -08:00 |
|
Thijs Wenker
|
709ad84933
|
added clone functionality to Overlays:
Overlays.cloneOverlay(OverlayID)
|
2014-11-05 23:44:59 +01:00 |
|
ZappoMan
|
99adb413e3
|
add 3D text overlay support
|
2014-10-21 08:20:15 -07: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 |
|