Commit graph

72945 commits

Author SHA1 Message Date
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
amantley
cd7af8b605 changed the name of sumuserheightsensorspace to averageuserheightSensorSpace 2018-10-17 08:51:40 -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
amantley
baeccebfb9 changed the transition times to make the sit longer and the stand shorter 2018-10-16 17:45:55 -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
amantley
02f499e9f7 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-16 16:56:10 -07:00
amantley
1764531822 removed hand azimuth changes, that fixed azimuth when hands go behind origin of MyAvatar, these changes will be in a separate pr 2018-10-16 16:31:55 -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
amantley
cf7dc49499 removed a commment and changed the sanity check to be a const instead of a magic number 2018-10-16 16:04:31 -07:00
amantley
952b112271 changed the transition times to make them shorter sit == 3sec stand == 1sec, also added failsafe for when the average height is above 5ft. this can recover from a missed transition to standing. 2018-10-16 15:10:26 -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
amantley
7d7fe8c089 removed some cruft 2018-10-15 18:12:27 -07:00
amantley
49b869c5e3 got rid of velocity count, now use 'away' to trigger when to start computing the sit stand state 2018-10-15 18:02:50 -07:00
amantley
9ec999e15e added condition for start up in oculus that gets the correct starting height 2018-10-15 16:43:03 -07: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
amantley
ae3ae9ce9a put in condition for away mode so that when you take the hmd off and put it back on the initial guess to your state is made again. 2018-10-15 09:52:34 -07:00
amantley
8e272d6dd2 added the correction code for when you are misslabeled as sitting while you are standing. It will now handle a sit down correctly. Also made the first approximation of state based on the average user height. This should use the user input of their height associated with their account 2018-10-15 08:43:25 -07:00
Sam Gondelman
121fc7205c Delete Default-Sky-9-cubemap.texmeta 2018-10-14 22:36:22 -07:00
amantley
e37e38d396 Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix 2018-10-14 20:17:01 -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
amantley
90c9e578c8 when you unlock the transitions you now start in stand state 2018-10-12 16:47:53 -07:00
amantley
ee830cdcb0 cleaned white space 2018-10-12 16:05:31 -07:00
amantley
7dd156ccdd made the threshold for the spine angle larger to make auto transitions more robust 2018-10-12 15:00:15 -07:00
Howard Stearns
a92aa1f9da new treatment for hmd/tablet login 2018-10-12 14:17:23 -07:00
Dante Ruiz
fa6b3019f6 fix js memory leak 2018-10-12 12:07:39 -07:00
Dante Ruiz
d7dc69129a improve loading bar progress 2018-10-12 11:43:03 -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
amantley
ab7a70acba Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix 2018-10-11 22:55:55 -07:00
amantley
67afc86222 cleanup 2018-10-11 18:39:44 -07:00
Liv Erickson
a6339bbe85 bug fix and new menu content 2018-10-11 17:26:05 -07:00
Clement
1bcbda7ad6 Prevent race on internal client traits members 2018-10-11 16:16:24 -07:00
amantley
f73d974ad7 added a lock state so you can lock sit or stand state, also made the
hand azimuth relative to the spine2 location in avatar space. This stops
the arms from behaving badly when the hands are in front of the chest
but behind the root position of the avatar
2018-10-11 15:14:33 -07:00
Howard Stearns
6c6d29152f new images for My Purchases rez tutorial 2018-10-11 12:36:43 -07:00
Dante Ruiz
451142f9a3 fixing some more interstittial issues 2018-10-11 11:33:19 -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
amantley
5faf26abd1 turned off shoulder rotation when we don't have hmd lean recentering on. this temporarily fixes the behavior of the shoulders in this mode. todo: use the spine2 position to determine azimuth of hands, then they will work in all conditions 2018-10-11 10:38:59 -07:00
Sam Gondelman
39c828fad8
please 2018-10-10 19:07:49 -07:00