SamGondelman
b189433855
merge
2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
samcake
1d3ae1b187
Work in progress to get the render items beeing tagged correctly for groupCulled
2018-02-13 17:50:01 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
SamGondelman
5337377ef5
Merge remote-tracking branch 'upstream/master' into decals
2018-02-09 14:40:20 -08:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
Seth Alves
64a46bf5df
merge from upstream
2018-01-31 10:43:41 -08:00
Sam Gateau
51dac04374
Introducing the tag in lieu of the vsisiblity mask
2018-01-26 02:59:43 -08:00
samcake
ae6a95ec0d
fixing my bugs on vissibility
2018-01-24 18:07:35 -08:00
samcake
38242072e5
Merge branch 'cauterize-head-av-entities-1' of https://github.com/sethalves/hifi into seth-branch
2018-01-23 16:30:54 -08:00
Seth Alves
1cbc2e31cf
merge from upstream
2018-01-23 15:21:03 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
Sam Gateau
d38d13cbb9
Trying to address the overlays to not be visisble in 2nd camera
2018-01-21 23:47:45 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
Seth Alves
bce9b5f459
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 09:53:54 -08:00
Seth Alves
7c32d3c536
flip logic back around
2018-01-18 13:49:17 -08:00
Seth Alves
fb974b0b9c
attempt to straighten out use of view-visibility masks
2018-01-18 10:09:23 -08:00
David Rowe
9b0fb19cfa
Remove unused "anchor" Overlays property
2018-01-12 12:16:58 +13:00
David Rowe
3d9d2a1859
Filed overlay property has been removed
2018-01-09 14:35:02 +13:00
SamGondelman
6a19b0e0b6
update render items on texture load
2018-01-04 13:10:46 -08:00
humbletim
a146b778f7
support additional .extraInfo for ray intersections
2017-12-21 12:35:13 -05:00
SamGondelman
bd06dc6443
cleaning up modelmeshpartpayload
2017-12-20 11:00:14 -08:00
David Rowe
578c42b4ea
Merge branch 'master' into 21624
2017-12-13 09:41:09 +13:00
Sam Gateau
d1cd9f5c6b
adding correct support for the meta item fetch subItems for Overlays and specifically for ModelOverlay which fixes the highlight on Overlays
2017-12-11 02:21:09 -08:00
David Rowe
0146eca315
JSDoc review
2017-12-07 10:09:05 +13:00
David Rowe
cafebf6a7e
Fix Unix build warnings and tidy initializers
2017-12-06 13:38:42 +13:00
David Rowe
2752dc7cac
Fix dimensions of cloned cube, sphere, shape, and model overlays
2017-12-06 12:28:55 +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
David Rowe
3535071178
Add "size" as synonym for "dimensions" in model overlay property setter
2017-11-22 21:04:04 +13:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
SamGondelman
7e6d5d9d98
merge with master
2017-10-06 14:57:08 -07:00
SamGondelman
477dfdff1e
wip hud layering and fix crashes
2017-10-04 11:45:21 -07:00
Brad Hefta-Gaub
a1979a2600
Merge branch 'master' into RC-56
2017-10-03 18:16:21 -07:00
SamGondelman
572986bfad
fix modeloverlay visible change
...
(cherry picked from commit 0bb27a7165
2017-10-01 13:40:00 -07:00
SamGondelman
0bb27a7165
fix modeloverlay visible change
2017-09-29 17:48:59 -07:00
ZappoMan
9c81bc5479
CR fixes
2017-09-29 09:52:30 -07:00
ZappoMan
be7729b276
support animation of model overlays
2017-09-28 15:14:59 -07:00
samcake
510b446409
mergine with master, resolving conflict
2017-09-26 13:13:46 -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
Anthony J. Thibault
a8a5138c18
remove USE_N_SCALE preprocessor check
2017-09-20 09:23:13 -07:00
Anthony J. Thibault
0757f513af
Merge branch 'master' into feature/ant-man
2017-09-18 11:36:39 -07:00
samcake
524c94cdd4
Adding more comments for future fixmes
2017-09-15 14:35:45 -07:00
Anthony J. Thibault
6e6687c3a6
Change tablet dimensions as sensorToWorldScale changes
2017-08-30 18:21:25 -07:00
Anthony J. Thibault
c9cdaadeb5
Better scale support in SpatiallyNestable class.
...
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.
Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field. a new _dimensions member variable is used instead. The SpatiallyNestable scale
field for entities should always be one.
Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.
Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.
Added qDebug stream support for Transform class.
2017-08-30 15:46:36 -07:00
Andrew Meadows
7b879a7964
Model has a Rig rather than a RigPointer
2017-05-19 13:24:16 -07:00
