Commit graph

72789 commits

Author SHA1 Message Date
NissimHadar
abef242248 Updated user manual. 2018-10-17 13:33:25 -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
Andrew Meadows
3b1b64b057 fix logic in readyToAnimate() 2018-10-17 11:45:39 -07:00
Andrew Meadows
da0d70af3f don't use string comparison when polling for changed animation URL 2018-10-17 11:45:39 -07:00
Andrew Meadows
0c61779331 remove deprecated cruft; stub setAnimationURL() override 2018-10-17 11:45:39 -07:00
Andrew Meadows
148944814b consolidate two bad string checks into one 2018-10-17 11:45:39 -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
Thijs Wenker
4ef2ad041b
Merge pull request #14136 from thoys/feat/create/exportSelection
MS19053: [CreateApp/EntityList] Move export selection button to bottom of the list
2018-10-17 19:50:37 +02:00
SamGondelman
c5a94a415d fix material entity opacity maps 2018-10-17 09:59:43 -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
Sam Gondelman
19fd7b5ac7
cr 2018-10-16 18:24:14 -07:00
Anthony Thibault
27c495406e Disable user hand controllers if they are too far away or not moving. 2018-10-16 17:24:47 -07:00
Anthony Thibault
cd3bb1fad2
Merge pull request #14165 from luiscuenca/fixSmallStep
Increase velocity increments when the avatar is really small.
2018-10-16 16:31:13 -07:00
Anthony Thibault
7f102727f2
Merge pull request #14166 from luiscuenca/fixJumpWhenSmall
Allow avatar to fly when its scale is very small
2018-10-16 16:28:00 -07:00
SamGondelman
a8a0671d6c fix heap use after free 2018-10-16 15:00:19 -07:00
SamGondelman
49b496046b queryAACube fixes 2018-10-16 14:35:39 -07:00
David Rowe
353938193e Add return value 2018-10-17 08:03:56 +13:00
SamGondelman
ded8d4b547 variant conversions 2018-10-16 11:55:28 -07:00
John Conklin II
b5f6d9d3d8
Merge pull request #14205 from howard-stearns/tablet-login-change
new treatment for hmd/tablet login
2018-10-16 11:31:45 -07:00
Olivier Prat
6abffceb43 Mip generation texture slot is higher and doesn't interfere anymore 2018-10-16 09:39:32 +02:00
Anthony Thibault
c19194fed5 Squelch cmake warning CMP0074 without requiring an update to cmake 3.12. 2018-10-15 16:12:28 -07:00
David Rowe
c9919ff69d Hide mini tablet immediately upon near grabbing an entity 2018-10-16 08:22:30 +13:00
Thijs Wenker
f1885159d2 style fixes 2018-10-15 21:17:41 +02:00
Sam Gondelman
121fc7205c Delete Default-Sky-9-cubemap.texmeta 2018-10-14 22:36:22 -07:00
Clement
3bfc5011f5 Remove _pendingAvatars struct 2018-10-12 17:57:48 -07:00
amantley
05d3becd40 changed cg hips computation so that it is not computed when hmdleanrecenter is turned off 2018-10-12 17:03:34 -07:00
Howard Stearns
a92aa1f9da new treatment for hmd/tablet login 2018-10-12 14:17:23 -07:00
Seth Alves
47d3c9ba27 go to error-room when failing to connect to a full domain 2018-10-12 11:28:54 -07:00
Howard Stearns
6c6d29152f new images for My Purchases rez tutorial 2018-10-11 12:36:43 -07:00
Stephen Birarda
b31af8c9c6
Merge pull request #14052 from birarda/macos-10.14
updates for deprecating cmake policies and MacOS 10.14 build
2018-10-11 11:31:43 -07:00
Clement
d79a47eac3 Increase AJAX timeout until we make a proper fix 2018-10-11 11:31:36 -07:00
Sam Gondelman
39c828fad8
please 2018-10-10 19:07:49 -07:00
Roxanne Skelly
6b05f7b030 Clicking on a user in the goto menu was taking one to the wrong user 2018-10-10 17:16:56 -07:00
Sam Gondelman
2421f9388c
FIX BUILD ERRORS? 2018-10-10 17:09:35 -07:00
Roxanne Skelly
af055bb45c more bug fixes and cleanup of some console logging 2018-10-10 16:50:07 -07:00
Sam Gondelman
6ed38ea333
fix build errors 2018-10-10 16:16:56 -07:00
Sam Gondelman
296bd65c9b
fix build errors 2018-10-10 16:05:14 -07:00
Roxanne Skelly
f6a8383d53 Bugfixes 2018-10-10 15:49:22 -07:00
Howard Stearns
30971cd766 make room for keyboard and help in SendAsset 2018-10-10 15:43:20 -07:00
SamGondelman
327c2f4e3d move blendshape buffers to render thread 2018-10-10 15:32:53 -07:00
Clement
bcbbe884c7 Timebox readPendingDatagrams 2018-10-10 12:56:41 -07:00
SamGondelman
9788aa307e remove width/height/depth 2018-10-10 12:38:07 -07:00
Roxanne Skelly
0302fee23d Merge branch 'master' of https://github.com/highfidelity/hifi into sysTraySubmenus 2018-10-10 11:48:30 -07:00
Roxanne Skelly
b052a12d16 Remove unnecessary logging. 2018-10-10 11:48:12 -07:00
Clement
8a95c58f86 Revert packet processing split 2018-10-10 11:46:53 -07:00