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

22 commits

Author SHA1 Message Date
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
fa03a7eb0c fix ubuntu build 2014-11-14 19:53:56 +01:00
David Rowe
fac6b6b426 Refactor QRect conversion to QScriptValue 2014-11-12 21:32:55 -08:00
David Rowe
9e19641a1d Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Thijs Wenker
709ad84933 added clone functionality to Overlays: 
Overlays.cloneOverlay(OverlayID)
 2014-11-05 23:44:59 +01:00
ZappoMan
3e9bc23c2f moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes 2014-10-29 10:19:04 -07:00
Stephen Birarda
df6f4d4c95 remove cara face tracking, cleanup warnings 2014-10-10 14:17:52 -07:00
David Rowe
b718d27ac6 Merge branch 'master' into 20073 2014-10-10 12:04:36 -07:00
ZappoMan
8105ded4eb handle reloading a new url in billboard overlays 2014-10-09 21:12:05 -07:00
David Rowe
614f5314f2 Add some property setters to the billboard overlay 2014-10-04 19:32:20 -07:00
ZappoMan
515789927b fix float defines from CR feedback 2014-10-03 09:43:46 -07:00
ZappoMan
175e5d5f79 add ray picking to 3D overlays 2014-10-02 20:44:49 -07:00
ZappoMan
5bcbfe96b8 add alpha color support to billboard overlay 2014-10-02 10:19:08 -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
Stephen Birarda
7964180905 handle place creation at new API endpoint 2014-09-11 17:33:01 -07:00
Atlante45
28d4efbad6 Don't display anything if overlays not loaded 2014-07-29 13:15:09 -07:00
Atlante45
7ad90ac7bb When visible is false, don't render billboards/models overlays 2014-07-11 11:29:58 -07:00
Atlante45
22bcb7d7e7 Billboard overlays disply grey square while image is loading 2014-07-11 11:22:06 -07:00
Atlante45
bd7b17a787 Added subimage to Billboards overlays 2014-07-11 10:50:11 -07:00
Atlante45
ab15a1487e Switched BillboardOverlay to NetworkAccessManaqer 2014-07-01 17:44:38 -07:00
Atlante45
d63ad86db0 Removed unnecessary function 2014-07-01 15:37:52 -07:00
Atlante45
19be406b1a Added billboards overlays 2014-07-01 15:09:30 -07:00