Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 15:14:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59470 commits 25 branches 0 tags 1.1 GiB
Commit graph

44 commits

Author SHA1 Message Date
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -07:00
SamGondelman
0117950546 can edit drawHUDLayer property 2017-07-25 12:57:52 -07:00
SamGondelman
3149c3e16c warnings 2017-07-25 10:16:50 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
Zach Fox
4374d4d1e5 Small improvements to overlay 2017-07-19 15:27:48 -07:00
Andrew Meadows
31bfc98b87 use const reference for ScenePointer when possible 2017-04-18 11:52:22 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Seth Alves
4886f1cbfc don't run stylus-on-overlay code unless the overlay is a web3d overlay 2017-03-06 12:38:19 -08:00
Seth Alves
05c135b9d8 uuid keys for overlays appears to work 2017-02-16 21:22:23 -08:00
Seth Alves
c1e41311fc working toward using uuids for overlay IDs 2017-02-16 17:18:09 -08:00
Seth Alves
e4e86c245e 3d overlays can be children of entities or avatars 2016-07-31 14:11:56 -07:00
Atlante45
38f74c1843 Remove the last of the glow level 2016-05-14 14:49:31 -07:00
Brad Davis
2f89253dc1 Make Overlays usable from QML 2016-03-04 11:35:54 -08:00
samcake
1c53f9bc87 Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly 2016-02-23 10:40:50 -08:00
Zach Pomerantz
5d1aedf707 Update scene items on overlay3d edits 2016-02-15 13:05:19 -08:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00
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)