Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 01:16:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28030 commits 71 branches 56 tags 1.2 GiB
Commit graph

40 commits

Author SHA1 Message Date
Bing Shearer
99c563602f Fixed Else case where _renderImage is true but the texture has 0 size, else case did not previously exist. 2015-07-09 15:25:37 -07:00
Bing Shearer
85f6fdb8cf Fixed bug which would cause program to crash if there was no image associated with an overlay in windows build (see checkbox in sunLightExample) 2015-07-09 14:20:10 -07:00
Atlante45
55c490043f Restore InterfaceConfig.h includes 2015-06-24 16:13:42 -07:00
Atlante45
e3d22ef94b Fix overlays getBounds + code cleanup 2015-06-24 16:13:42 -07:00
ZappoMan
912b851eb7 remove crufty references to QGLWidget 2015-02-25 12:54:34 -08:00
samcake
e3fa2e1995 Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval 
Removal of glColorXXX()
 2015-01-30 10:21:18 -08:00
Sam Gateau
ec54ac7401 Fixing the non loading of some texture because the QImage bit size is not exactly what's expected 2015-01-29 15:24:36 -08:00
Sam Gateau
b2f16be92a Fixing the non loading of some texture because the QImage bit size is not exactly what's expected 2015-01-29 15:17:55 -08:00
ZappoMan
5df45c7dce build buster and warnings fixes 2015-01-27 16:55:16 -08:00
ZappoMan
4a6cc5c6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
 2015-01-27 16:44:11 -08:00
Ryan Huffman
6a9f135e1c Cleanup image clipping in ImageOverlay 2015-01-27 08:11:37 -08:00
Ryan Huffman
d27a26967f Update ImageOverlay to take texture rescaling into account 2015-01-27 08:09:47 -08:00
Ryan Huffman
0e9e77f166 Fix broken support for color-only ImageOverlay 2015-01-22 08:58:55 -08:00
Ryan Huffman
52193fce38 Remove qDebug 2015-01-22 08:35:38 -08:00
Ryan Huffman
ba2f7d88ce Update ImageOverlay to use TextureCache 2015-01-21 15:09:09 -08:00
ZappoMan
bddb7856af more work 2015-01-19 13:34:09 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -08:00
ZappoMan
3d42d532e4 more work on removing immediate mode GL_QUADS 2014-12-22 17:43:02 -08:00
Ryan Huffman
25a78534aa Fix quad vertices for ImageOverlay and TextOverlay 2014-12-19 15:52:31 -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
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
725d56d41f Add property getting for all 2D overlays 2014-11-12 16:50:13 -08:00
Thijs Wenker
d3d80d3fe2 filled in the rest of the properties 2014-11-06 00:34:59 +01:00
Thijs Wenker
709ad84933 added clone functionality to Overlays: 
Overlays.cloneOverlay(OverlayID)
 2014-11-05 23:44:59 +01:00
Stephen Birarda
14f216e9c7 set imageURL in ImageOverlay when imageURL is changed 2014-10-30 10:05:31 -07: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
b4cfce8ffa final NetworkAccessManager return repairs 2014-10-06 14:58:23 -07:00
ZappoMan
515789927b fix float defines from CR feedback 2014-10-03 09:43:46 -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
Atlante45
6489151578 Switch ImageOverlay to NetworkAccessManager 2014-07-02 10:28:26 -07:00
Atlante45
12ebfd92d1 Memory leak 2014-07-01 15:12:31 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
matsukaze
d28d686ceb Fix for missing voxel system on domain change. Fix for assertion failure thrown by Qt on exit. 2014-04-02 17:45:22 -07:00
ZappoMan
a56b7e341d reorganize files in interface directory 2014-03-22 20:22:05 -07:00
Renamed from interface/src/ui/ImageOverlay.cpp (Browse further)