David Rowe
|
578c42b4ea
|
Merge branch 'master' into 21624
|
2017-12-13 09:41:09 +13:00 |
|
David Rowe
|
0146eca315
|
JSDoc review
|
2017-12-07 10:09:05 +13:00 |
|
David Rowe
|
b9ad15b19e
|
Add missing line3d overlay property getters
|
2017-11-29 11:03:16 +13:00 |
|
David Rowe
|
3956b3b953
|
Fix missing line3d overlay property setter overrides of base class
|
2017-11-29 10:41:51 +13:00 |
|
David Rowe
|
76c934f012
|
Add missing line3d overlay property setters
|
2017-11-29 10:41:21 +13:00 |
|
David Rowe
|
cd2922a560
|
Merge branch '21602' into 21624
# Conflicts:
# tools/jsdoc/plugins/hifi.js
|
2017-11-28 17:04:59 +13:00 |
|
David Rowe
|
4b5aa9bdec
|
Add Overlays API functionality JSDoc
|
2017-11-25 16:18:14 +13:00 |
|
ZappoMan
|
04ee1adabd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
|
2017-11-19 14:40:31 -08:00 |
|
John Conklin II
|
8592f3fd4d
|
Merge pull request #11764 from luiscuenca/case7587
7587 Lasers resize with avatar
|
2017-11-15 09:31:45 -08:00 |
|
luiscuenca
|
d53a29b958
|
correction
|
2017-11-10 12:24:19 -07:00 |
|
luiscuenca
|
bf576e63fe
|
move constant to class definition
|
2017-11-10 11:54:53 -07:00 |
|
luiscuenca
|
255a40ce31
|
Corrections
|
2017-11-09 18:38:04 -07:00 |
|
luiscuenca
|
7dfdc8da59
|
Redesign and clean of unused lineWidths
|
2017-11-09 17:50:38 -07:00 |
|
SamGondelman
|
9188ae9fb5
|
fix laser end not disappearing
|
2017-11-09 16:26:37 -08:00 |
|
SamGondelman
|
224386317d
|
send overlay visibility through transaction
|
2017-11-09 12:14:40 -08:00 |
|
luiscuenca
|
1791ed01ca
|
add width param to vertex shader
|
2017-11-08 18:35:26 -07:00 |
|
luiscuenca
|
8c5f97f3d1
|
More corrections
|
2017-11-07 20:25:24 -07:00 |
|
luiscuenca
|
332cb48a41
|
Lasers and teleport scale with avatar
|
2017-11-07 16:57:55 -07:00 |
|
ZappoMan
|
a7a0f03ede
|
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
|
2017-10-27 18:39:17 -07:00 |
|
SamGondelman
|
55ba093f09
|
update line render transform on end edit
|
2017-10-23 13:09:40 -07:00 |
|
Andrew Meadows
|
26ea7034d8
|
prevent zero scale for Line3DOverlay
|
2017-09-27 14:30:50 -07:00 |
|
samcake
|
219d63784b
|
REmoving the extra variables in Linear3D and just use the _renderTRansform
|
2017-09-22 10:39:51 -07:00 |
|
samcake
|
7103864b37
|
Also rendering the line3D overlay with start and end captured in game loop
|
2017-09-21 12:23:53 -07:00 |
|
samcake
|
d112ffd8d6
|
Moving all the 3D overlay transform evaluation out of the render thread to the game loop, need to do something for the line3d
|
2017-09-20 18:06:49 -07:00 |
|
samcake
|
524c94cdd4
|
Adding more comments for future fixmes
|
2017-09-15 14:35:45 -07:00 |
|
SamGondelman
|
3a80c6cbe2
|
fix alpha issues, pipeline issue, clamping issue
|
2017-08-21 18:09:25 -07:00 |
|
SamGondelman
|
8163430282
|
fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds
|
2017-08-14 15:03:14 -07:00 |
|
Seth Alves
|
adc3581d63
|
remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay
|
2017-03-07 19:32:34 -08:00 |
|
Seth Alves
|
88d6fe6a04
|
fix offset relative to endParent
|
2017-03-02 16:26:56 -08:00 |
|
Seth Alves
|
5f570c1ba8
|
fix up bounds handling in Line3DOverlay
|
2017-03-02 16:16:48 -08:00 |
|
Seth Alves
|
7f6b803652
|
3d-line-overlays can now have an endParentID and endParentJointIndex
|
2017-03-01 17:27:32 -08:00 |
|
Seth Alves
|
7c4869eb73
|
fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother
|
2017-03-01 16:10:07 -08:00 |
|
Seth Alves
|
bc5f563f57
|
make _parentID and _parentJointIndex private to avoid accidental direct access
|
2017-02-12 11:37:29 -08:00 |
|
Brad Hefta-Gaub
|
df954cab10
|
remove some log spam, recatargorize script logs to allow fine grain filtering
|
2016-12-19 16:15:10 -08:00 |
|
Brad Davis
|
99ed7ac08c
|
Fix shutdown crash (hopefully)
|
2016-10-17 17:38:10 -07:00 |
|
Brad Davis
|
dde79ef3c5
|
Fix GPU buffer leak in geometry cache / overlays
|
2016-10-17 12:22:20 -07:00 |
|
Ryan Huffman
|
54498a8f3f
|
Add the ability to ignore invisible entities in findRayIntersection
|
2016-10-07 10:30:18 -07:00 |
|
Seth Alves
|
8487f825a0
|
don't return reference to local variables
|
2016-08-18 08:01:42 -07:00 |
|
Seth Alves
|
2ff35768aa
|
make 3d-line overlays work again
|
2016-08-17 18:45:09 -07:00 |
|
Seth Alves
|
15e2140cb2
|
Merge branch 'master' of github.com:highfidelity/hifi into overlay-children
|
2016-08-11 15:06:58 -07:00 |
|
SamGondelman
|
2eb0c7735f
|
working on fading shape entities
|
2016-08-03 13:30:05 -07:00 |
|
Seth Alves
|
e4e86c245e
|
3d overlays can be children of entities or avatars
|
2016-07-31 14:11:56 -07:00 |
|
Brad Davis
|
8ca3630cfa
|
Support glow effect in 3D line overlays
|
2016-07-07 13:36:48 -07:00 |
|
Brad Davis
|
b7926b8582
|
Don't render wire geometry with lighting effects
|
2016-06-30 16:11:05 -07:00 |
|
Brad Davis
|
2f89253dc1
|
Make Overlays usable from QML
|
2016-03-04 11:35:54 -08:00 |
|
Zach Pomerantz
|
48aaac2971
|
Render line3d without backface culling
|
2016-03-01 14:57:02 -08:00 |
|
Zach Pomerantz
|
53bd595b77
|
Update all appropriate overlays to use plumber
|
2016-02-03 19:18:56 -08:00 |
|
Atlante45
|
11dc3cd261
|
Move primitive rendering out of DeferredLightingEffect
|
2016-01-13 11:47:43 -08:00 |
|
Seth Alves
|
817f0307a0
|
fix 3d line overlays
|
2015-12-04 15:51:19 -08:00 |
|
Zander Otavka
|
da2afca391
|
Expose overlay type checking to JavaScript.
|
2015-07-31 11:26:04 -07:00 |
|