Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-17 18:22:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25568 commits 26 branches 28 tags 1.2 GiB
Commit graph

294 commits

Author SHA1 Message Date
Brad Davis
ac93d2c721 Working on display plugins 2015-05-21 18:50:11 -07:00
Bradley Austin Davis
9f8a384c72 Merge branch 'plugins_pt2' into plugins 2015-05-08 16:05:51 -07:00
Bradley Austin Davis
03bd17ed49 Rebasing onto scale changes 2015-05-08 15:09:46 -07:00
Bradley Austin Davis
5e821b4447 Updating plugins 2015-05-07 22:32:28 -07:00
Bradley Austin Davis
efa88ba122 Merge branch 'scale' into plugins 2015-05-07 12:52:13 -07:00
Bradley Austin Davis
77a9f7fa2a Merge branch 'plugins_pt1' into plugins 2015-05-06 14:22:13 -07:00
Atlante45
aa10dc3991 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-05 15:04:11 +02:00
Atlante45
12fcb35717 Made RenderArgs a default ctor 2015-05-04 17:22:46 +02:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Brad Davis
031b294ae5 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Camera.cpp
	interface/src/Camera.h
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/ApplicationOverlay.h
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/GlowEffect.h
	libraries/render-utils/src/TextureCache.cpp
 2015-04-30 12:14:07 -07:00
Seth Alves
b23427a3c8 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 10:32:47 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Ryan Huffman
b31f95a002 Fix cube rendering not working with transparency 2015-04-23 09:34:23 -07:00
Brad Davis
9f0d410387 Working on decoupling rendering 2015-04-13 23:15:51 -07:00
Sam Gateau
7de54917b8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-06 10:20:23 -07:00
Ryan Huffman
ce2c23de51 Fix color not working for wire circle3d 2015-04-03 16:28:12 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
Brad Davis
e616308911 Adding runtime check to ensure that the correct frustum is fetched during rendering 2015-03-17 16:28:44 -07:00
Ryan Huffman
ebf70f818a Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2 
Conflicts:
	examples/editEntities.js
 2015-03-12 11:39:26 -07:00
Ryan Huffman
36c14de250 Add rotation to facingAvatar billboard overlays 2015-03-10 13:11:39 -07:00
David Rowe
abb62fd8f9 Fix typo found in passing 2015-03-10 10:57:48 -07:00
Andrew Meadows
7b68916010 Merge pull request #4343 from ZappoMan/hangOnExit 
BUG FIX: Hang on exit
 2015-02-25 17:02:26 -08: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
Ryan Huffman
c499352ad8 Update billboard and planar overlays to use new findRayRectangleIntersection signature 2015-02-25 10:27:11 -08:00
Ryan Huffman
eb21b74439 Replace Planar3DOverlay::findRayIntersection with GeometryUtil::findRayRectangleIntersection 2015-02-24 17:01:24 -08:00
Ryan Huffman
be7959bbcd Fix BillboardOverlay findRayIntersection implementation 2015-02-24 17:00:55 -08:00
Ryan Huffman
89c10ca2ec Fix BillboardOverlay::findRayIntersection 2015-02-24 14:36:24 -08:00
Seth Alves
dd64eeb282 fix uninitialized geometry cache id in Line3DOverlay 2015-02-17 11:47:29 -08:00
Seth Alves
42511f3b7f M-x mangle buffer 2015-02-13 15:23:22 -08:00
Seth Alves
98b445b22f the geometryCacheID for Rectangle3DOverlay wasn't being initialized (so was randomish). if they overlapped, some would be drawn looking like others 2015-02-13 15:21:03 -08:00
Ryan Huffman
a527bd85ba Update Text3DOverlay::textSize to use new TextRenderer::getExtents 2015-02-11 12:13:26 -08:00
Ryan Huffman
d7e18d6f6d Update TextOverlay::textSize to use new TextRenderer::getExtents 2015-02-11 11:04:04 -08:00
Brad Hefta-Gaub
d3b387c1e0 Merge pull request #4247 from Atlante45/fix_3d_text_billboards 
Fix funky text 3D overlays
 2015-02-06 15:01:47 -08:00
Brad Hefta-Gaub
b3fb1b2403 Merge pull request #4246 from ctrlaltdavid/20282 
CR for Job #20282 - Finish implementing Planar3DOverlay intersection code
 2015-02-06 14:19:35 -08:00
Atlante45
920082331f Fix funky text 3D overlays 2015-02-06 14:15:10 -08:00
David Rowe
67e2e748e7 Merge branch 'master' into 20282 2015-02-06 13:25:43 -08:00
Stephen Birarda
219e78425b resolve conflicts on merge with upstream master 2015-02-06 09:49:46 -08:00
David Rowe
3ceb1123b3 Cater for ellipses in circle3d overlay intersection 2015-02-05 09:39:16 -08:00
David Rowe
2f6749ff69 Implement dimensions test for 3D planar overlay intersection 2015-02-05 09:38:45 -08:00
David Rowe
056365932b Make circle3d dimension property specify overall size not half size 2015-02-05 09:37:08 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Brad Davis
f471597a73 Merge branch 'develop' into text-renderer 2015-02-03 23:07:19 -08:00
Brad Davis
0c78af9abb Working on text rendering refactor 2015-02-03 18:57:39 -08:00
Brad Davis
d64e7c464a Merge branch 'develop' into text-renderer 2015-02-03 18:44:06 -08:00
David Rowe
8297bbd5e7 Fix orientation of non-solid rectangle3d overlays, too 2015-02-03 15:52:20 -08:00
David Rowe
7f7cba8a1b Fix orientation of rectangle3d overlays to match other 3D overlays 2015-02-03 10:54:16 -08:00
Stephen Birarda
e07ce23825 resolve conflicts on merge with upstream master 2015-02-03 10:25:17 -08:00
Ryan Huffman
13ea8ddb9e Add missing _texture to BillboardOverlay copy ctor 2015-02-03 08:52:58 -08:00
Brad Davis
6cfb51283e Working on the text renderer 2015-02-03 01:49:06 -08:00