Commit graph

29808 commits

Author SHA1 Message Date
John Conklin II
1cc2569bd8
Merge pull request #13596 from SamGondelman/scriptvec3
Replace vec2, vec3, and xColor properties with JS prototypes
2018-10-18 09:47:56 -07:00
John Conklin II
8e5bc1678f
Merge pull request #14219 from SamGondelman/materialCull
QueryAACube fixes and materials expand to include their parent
2018-10-17 15:15:23 -07:00
Sam Gondelman
3f117cd3e0
Merge branch 'master' into scriptvec3 2018-10-17 13:57:21 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1
move grab pseudo-properties (userData) into first-class EntityItemProperties
2018-10-17 13:29:20 -07:00
Sam Gondelman
e3543cf098
Merge branch 'master' into scriptvec3 2018-10-17 13:10:29 -07:00
John Conklin II
7b226aa559
Merge pull request #14124 from SamGondelman/particle
Don't render particles without textures
2018-10-17 11:17:23 -07:00
John Conklin II
72c9f697ab
Merge pull request #14119 from SamGondelman/varying
Move stage frames to Varyings
2018-10-17 11:16:28 -07:00
John Conklin II
e59e3720fe
Merge pull request #14139 from SamGondelman/animation
Fix various ResourceCache bugs
2018-10-17 11:13:35 -07:00
John Conklin II
eb088772d0
Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls
Fix "Good" collision not honoring mesh groups in OBJ files
2018-10-17 11:12:21 -07:00
John Conklin II
9f0b4fb437
Merge pull request #14122 from SamGondelman/skybox
Rebake default skybox for all platforms
2018-10-17 09:50:00 -07:00
Sam Gondelman
cba4a4139a
fix compile error 2018-10-16 18:25:17 -07:00
SamGondelman
49b496046b queryAACube fixes 2018-10-16 14:35:39 -07:00
SamGondelman
ded8d4b547 variant conversions 2018-10-16 11:55:28 -07:00
Sam Gondelman
121fc7205c Delete Default-Sky-9-cubemap.texmeta 2018-10-14 22:36:22 -07:00
SamGondelman
9788aa307e remove width/height/depth 2018-10-10 12:38:07 -07:00
SamGondelman
c10bb7d525 pointers 2018-10-08 18:05:09 -07:00
unknown
4313a34ff3 Allow avatar to fly when its scale is very small 2018-10-08 15:35:07 -07:00
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3 2018-10-08 12:59:34 -07:00
sabrina-shanman
57f67ffe91 Do not have additional compoundMeshes variable in computeShapeInfo 2018-10-08 11:46:46 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged
Merged interstitial page/redirect domain improvements
2018-10-08 10:32:29 -07:00
John Conklin II
dc7a5c0867
Merge pull request #14147 from birarda/bug/large-traits
suppress traits larger than INT16_MAX bytes
2018-10-08 10:27:52 -07:00
John Conklin II
67c0262a4d
Merge pull request #14153 from hyperlogic/bug-fix/less-agressive-rotation-culling
Reduce the glitches of far away animating avatars
2018-10-08 09:33:26 -07:00
sabrina-shanman
e15a41c839 Fix model being loaded before dimensions are initialized 2018-10-08 09:26:35 -07:00
sabrina-shanman
c8cccc5ec7 Fix "good" collision not subdividing OBJ meshes by group 2018-10-08 09:24:33 -07:00
Anthony Thibault
335c60e6b8 Reduce the glitches of far away animating avatars
Currently, the avatars that are further then 10 meters away have a
very aggressive 15 degree rotation threshold, used to reduce the
amount of rotation joint changes sent over the network.

This PR tunes both the distances and rotation thresholds used for
this LOD culling.
2018-10-05 17:29:25 -07:00
Stephen Birarda
82170a66ed avoid backwards seek for skipped trait deletes 2018-10-05 15:07:54 -07:00
Andrew Meadows
c3478dc018 remove expired avatarEntities from their avatars 2018-10-05 13:48:35 -07:00
Stephen Birarda
88f76ac760 suppress traits larger than INT16_MAX bytes 2018-10-05 09:46:55 -07:00
Sam Gateau
46a50b04ea
Merge pull request #14034 from samcake/black-bis
Refactor Deformed mesh rendering pipeline for better scalability and performances at runtime
2018-10-04 20:41:28 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -07:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates
update soft entities and fix deadlock from qml.
2018-10-04 13:33:34 -07:00
John Conklin II
84178faee3
Merge pull request #14137 from hyperlogic/bug-fix/glitchy-movement-for-avatars
Bug fix for rotation culling in AvatarData::toByteArray()
2018-10-04 13:12:28 -07:00
divya
7aa715c383
Merge pull request #14141 from luiscuenca/transitFirstPacketFix
Fix avatars transit on domain enter
2018-10-04 13:08:59 -07:00
John Conklin II
48242534df
Merge pull request #14000 from sabrina-shanman/stt_parenting2
New Pick Parenting for Ray Picks and Parabola Picks
2018-10-04 12:39:45 -07:00
sam gateau
ddbaa96fd1 Merge branch 'black-bis' of github.com:samcake/hifi into black-bis 2018-10-04 11:49:36 -07:00
sam gateau
8a05cc2ede FIx the bad world position evaluation in the new all in one call 2018-10-04 11:49:11 -07:00
SamGondelman
4024f2a180 fix various resourcecache bugs 2018-10-04 11:29:22 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
Wayne Chen
d6af09ca62 ignoring entities in interstitial/saving address on 404 error 2018-10-03 17:40:42 -07:00
Sam Gondelman
4e96c3297b
Merge branch 'master' into scriptvec3 2018-10-03 17:14:15 -07:00
luiscuenca
a05e493e06 Long distance avatars should not be new 2018-10-03 17:09:51 -07:00
luiscuenca
bb98457d09 Fix avatars transit on domain enter 2018-10-03 16:23:09 -07:00
Sam
87efeb1a70 make sure that we compile, dah 2018-10-03 16:15:07 -07:00
sam gateau
81e0d5ced0 Merge branch 'black-bis' of github.com:samcake/hifi into black-bis 2018-10-03 16:03:33 -07:00
sam gateau
702d26d2bd Addressing the bug on Mac AMD 2018-10-03 16:03:09 -07:00
Sam Gateau
b1883ac1c4 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-03 13:43:48 -07:00
John Conklin II
4d7b2bb429
Merge pull request #14113 from Atlante45/feat/audio-mixer-throttle-equation
Audio Mixer Scaling
2018-10-03 13:17:28 -07:00
Anthony Thibault
c0ae95f853 Bug fix for rotation culling in AvatarData::toByteArray()
The commit 5a0de0f103 inadvertently introduced a regression in how the AvatarMixer and clients encode AvatarData packets.
When encoding packets that with the cullSmallChanges flag set to true, we only include rotations that have changed significantly from the previous packet.
A bug was introduced that incorrectly preformed the comparison to detect changed rotations, this needs to handle the case when
two quaternions are almost equal but have negative signs.  Previously, this was preformed with an absolute value after the 4-component dot product.
In commit 5a0de0f103, this absolute value was removed, causing the culling to happen much more frequently.

This PR re-introduces that absolute value.
2018-10-03 12:54:49 -07:00
Sam Gateau
c194e795ac Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-03 12:12:15 -07:00