Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 11:42:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30489 commits 24 branches 28 tags 1.2 GiB
Commit graph

28 commits

Author SHA1 Message Date
Brad Davis
54b7a063e2 Support HTML colors in overlays 2015-09-02 15:56:37 -07:00
Zander Otavka
da2afca391 Expose overlay type checking to JavaScript. 2015-07-31 11:26:04 -07:00
Atlante45
233d92c315 Some code cleanup 2015-06-24 15:44:47 -07:00
ZappoMan
4438263014 more hacking on overlay build busters 2015-06-03 20:46:59 -07:00
ZappoMan
49fa407cd5 fix build buster 2015-06-03 17:57:23 -07:00
ZappoMan
7fde574a2a make model overlays acutally use sub mesh payload items 2015-06-03 16:33:58 -07:00
Ryan Huffman
667dccbb87 Add Item::INVALID_ITEM_ID and use in overlays 2015-05-29 13:43:49 -07:00
Ryan Huffman
0e5cf273ab Fix AABox bounds handling in Overlays 2015-05-29 09:40:23 -07:00
Ryan Huffman
1089490658 Move overlay rendering to Scene 2015-05-29 08:51:25 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
ZappoMan
912b851eb7 remove crufty references to QGLWidget 2015-02-25 12:54:34 -08:00
ZappoMan
d1e648b392 remove unused references to QGLWidget* parent in Overlay and Overlays 2015-02-25 12:34:38 -08:00
ZappoMan
42e8d4d377 fix warnings in overlays 2014-11-15 20:38:21 -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
725d56d41f Add property getting for all 2D overlays 2014-11-12 16:50:13 -08:00
David Rowe
8c3bedae9d Add position vector and color object script value examples 
OverlayPropertyResult type is needed to successfully move QScriptValue
objects from QScriptEngine in Overlays to QScriptEngine in script.
 2014-11-12 14:33:52 -08: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
cd6adb8f28 CR feedback 2014-10-03 10:13:09 -07:00
ZappoMan
46d96c22fa CR feedback 2014-10-03 10:01:58 -07:00
ZappoMan
bffd236640 add glowLevel, and pulse to all overlays 2014-09-29 16:44:40 -07:00
Atlante45
28d4efbad6 Don't display anything if overlays not loaded 2014-07-29 13:15:09 -07:00
Ryan Huffman
123773a8e3 Add default background color and initialize property 2014-06-30 12:20:05 -07:00
Atlante45
61fd09e0bd Add ability to anchor an overlay 2014-05-15 16:24:31 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
ZappoMan
a56b7e341d reorganize files in interface directory 2014-03-22 20:22:05 -07:00
Renamed from interface/src/ui/Overlay.cpp (Browse further)