Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 12:13:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73099 commits 25 branches 0 tags 1.1 GiB
Commit graph

27282 commits

Author SHA1 Message Date
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
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
49b496046b queryAACube fixes 2018-10-16 14:35:39 -07:00
luiscuenca
078baa86e4 Sitting abort post transit animation 2018-10-16 13:16:01 -07:00
David Back
50becb5c37 merge particle explorer into properties, resurrect sliders, other tidying/fixes 2018-10-16 12:39:34 -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
luiscuenca
7da5fa9ea7 Transit animations won't play, they just get sent over the network 2018-10-16 11:33:58 -07: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
640ed6a32a Added "Developer > Avatar > Show Tracked Objects" menu 2018-10-15 12:42:07 -07: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
luiscuenca
ad09007bd8 Fix flickering holded entity, renames and refactors 2018-10-13 16:32:51 -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
luiscuenca
52ed6cb6e9 Abort settle animation if already moving 2018-10-12 11:35:51 -07:00
amantley
67afc86222 cleanup 2018-10-11 18:39:44 -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
luiscuenca
de1b6e717f Cancel animation on chained trasits 2018-10-11 11:35:56 -07:00
luiscuenca
2f10327ad3 Fix last anim value 2018-10-11 10:57:39 -07:00
luiscuenca
1adac78828 fix errors and set new anim parameters 2018-10-11 10:45:35 -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
Anthony Thibault
a3a87ef48b Debug rendering of tracked objects, remove filters from body. 2018-10-10 17:52:26 -07:00
Howard Stearns
30971cd766 make room for keyboard and help in SendAsset 2018-10-10 15:43:20 -07:00
unknown
82918a5c31 Add animation support 2018-10-10 12:31:16 -07:00
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
Anthony Thibault
0283c9fbdc Added CriticallyDampedSpringPoseHelper to help smooth out hips. 2018-10-09 10:51:02 -07:00
Anthony Thibault
7777f3edd0 Added OutOfRangeDataStrategy parameter to Controller Settings 
The openvr SDK provides a way to gauge the quality of tracking on a given device via the eTrackingResult enum.

* Drop - Only Running_OK is considered valid, all other eTrackingResults will return invalid poses.
* Freeze - Only Running_OK is considered valid, but other valid TrackingResults will return the last Running_OK pose.
  In esseces this will freeze the puck in place at the last good value.
* None - All valid eTrackingResults will be valid, including OutOfRange and Calibrating results.  This is the default.
 2018-10-09 10:51:02 -07:00
Anthony Thibault
d15cc86735 Added deceleration limit to AccelerationLimiterFilter 2018-10-09 10:51:01 -07:00
Anthony Thibault
8642edd144 Added acceleration limit filter to controller system 2018-10-09 10:51:01 -07:00
amantley
c4187f0d60 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-08 17:07:55 -07:00
unknown
3c25e6d5a8 Increase the linear velocity step when the avatar is small to avoid freezing 2018-10-08 14:40:54 -07:00
Clement
3eb7c80af3 Fix BandwidthRecorder storage concurrent accesses 2018-10-08 13:45:34 -07:00
unknown
1172e29d95 Clean up elbow smoothing code 2018-10-08 13:21:47 -07:00
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3 2018-10-08 12:59:34 -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
amantley
3517905435 added getter and setter for sitstandstatechange bool 2018-10-05 16:22:30 -07:00
Wayne Chen
f758438dcc
Merge pull request #9 from danteruiz/interstitialMerged 
fix for failing to enter domain
 2018-10-05 16:19:25 -07:00
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
amantley
96872f8412 moved all the state update for sit and stand to myavatar::update() also 
made it so that sit horizontal reset is handled in non-cg recentering.
to do: revisit what should be sent for desired body in prephysics update
call
 2018-10-05 14:55:43 -07:00
Andrew Meadows
c3478dc018 remove expired avatarEntities from their avatars 2018-10-05 13:48:35 -07:00
amantley
ad46b71966 before moving the step state counting to myavatar::update() 2018-10-05 13:04:14 -07:00
Wayne Chen
8abbd51bb1 removing unused variable 2018-10-04 23:11:27 -07:00
David Rowe
2ba8dc37d0 Miscellanous JSDoc fixes for issues noticed in passing 2018-10-05 16:57:29 +13:00
David Rowe
539c280281 Fill in missing JSDoc stubs in AvatarList and AvatarManager 2018-10-05 15:13:13 +13:00
danteruiz
d285080197 remmoving some debug statements 2018-10-04 18:38:25 -07:00
amantley
cbe638bfdb added flag for vertical recentering that is state change, snap, versus 
the usual .5 second recentering
 2018-10-04 18:17:27 -07:00
David Rowe
ea8e02a84a Fix and fill in JSDoc for MyAvatar flying-related functions 2018-10-05 14:05:33 +13:00
amantley
635300c6d5 changed pre physics to use cg for desired body when in cg mode 2018-10-04 18:05:05 -07:00
Dante Ruiz
5d011bafb2 small tweaks 2018-10-04 17:02:44 -07:00
Dante Ruiz
2a3b4a85c7 debugging 2018-10-04 15:57:05 -07:00
amantley
82f8c67436 put the mode in sensor space for cg 2018-10-04 15:37:01 -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
amantley
acce675efc added snap for recentering with sit stand state change. using average height with tipping point for thresholds 2018-10-04 14:53:51 -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
divya
7aa715c383
Merge pull request #14141 from luiscuenca/transitFirstPacketFix 
Fix avatars transit on domain enter
 2018-10-04 13:08:59 -07:00
Dante Ruiz
613a6ab8cd removing unneeded code 2018-10-04 12:18:18 -07:00
SamGondelman
4024f2a180 fix various resourcecache bugs 2018-10-04 11:29:22 -07:00
Wayne Chen
c785efec84 removing extraneous bool 2018-10-04 10:56:04 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
amantley
809ca0e512 vive hmd input is implemented. not using mode 2018-10-03 18:05:30 -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
Dante Ruiz
676293c880 trying another fix 2018-10-03 16:19:47 -07:00
Dante Ruiz
b46d2319b1 fix spelling error 2018-10-03 15:22:53 -07:00
Dante Ruiz
78268001c4 reverting logic change 2018-10-03 15:13:42 -07:00
Dante Ruiz
5734c24af4 another PR fix 2018-10-03 13:52:40 -07:00
sabrina-shanman
2ef85dfdba Merge branch 'master' into stt_parenting2 2018-10-03 11:39:00 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586 
Teleport with play area
 2018-10-03 11:02:33 -07:00
Dante Ruiz
b28c375ad3 better loading check logic 2018-10-03 09:57:32 -07:00
John Conklin II
05609384b7
Merge pull request #14111 from zfox23/newConnectionsQuery 
Fix MS18608: Use new connections api endpoint
 2018-10-03 09:04:58 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix 
Disable Hand Touch when Leap Motion is running
 2018-10-03 09:03:43 -07:00
Brad Hefta-Gaub
bb78a8dd5c
Merge pull request #14134 from jherico/fix/fb19088 
Fix avatar thumbnails
 2018-10-03 09:01:33 -07:00
amantley
8a0fbc3fe9 changed the height to use the mode . to do fix sensor space bug. 2018-10-02 17:47:56 -07:00
Wayne Chen
2d85f882b8 adding buttons 2018-10-02 17:47:09 -07:00
Alexia Mandeville
d769f83cdd
Merge branch 'master' into menu-updates 2018-10-02 16:43:08 -07:00
Brad Davis
ffbb144a7c Fix avatar thumbnails 2018-10-02 16:31:24 -07:00
Brad Hefta-Gaub
6b9842d4da
Merge pull request #14131 from Atlante45/feat/deadlock-backtrace 
Better deadlock crash
 2018-10-02 16:03:20 -07:00
Sam Gondelman
cd947f0a66
Merge pull request #14054 from gcalero/android_signup 
Android signup
 2018-10-02 12:37:57 -07:00
Clement
3c4e543b3c Better deadlock crash 2018-10-02 11:51:15 -07:00
John Conklin II
898ba20f1c
Merge pull request #14068 from hyperlogic/bug-fix/bad-avatar-pointer-static-cast 
Fix for bad static_pointer_cast on exit.
 2018-10-02 11:31:47 -07:00
Dante Ruiz
182c92b951 fix mac issue 2018-10-02 11:24:09 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Gabriel Calero
13e2b99dfa Merge remote-tracking branch 'upstream/master' into android_signup 2018-10-02 09:24:09 -03:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00
amantley
f0676d796c added constants and tipping point for running average. this should be replaced by the mode 2018-10-01 17:57:00 -07:00
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack 
Remove UndoStack API
 2018-10-01 17:13:48 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
John Conklin II
3ab83731b9
Merge pull request #14087 from sethalves/quiet-asan 
fix several uninitialized reads
 2018-10-01 16:48:54 -07:00
John Conklin II
dd5cd5de82
Merge pull request #14091 from gcalero/fix-case-18465 
Fix case 18465: redirect to domain after login
 2018-10-01 16:48:27 -07:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2 
Account-managed wallet flow improvements
 2018-10-01 16:43:01 -07:00
John Conklin II
8ad5ca5a67
Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix 
Fix avatar warp into floor when navigating to a saved bookmark
 2018-10-01 16:36:31 -07:00
Gabriel Calero
1422c178a4 Merge remote-tracking branch 'upstream/master' into android_signup 2018-10-01 20:36:27 -03:00
John Conklin II
87b39f690c
Merge pull request #14106 from jherico/fix/mac_gl1 
Fix some Mac rendering issues
 2018-10-01 16:35:57 -07:00
Seth Alves
c144671c97
Merge pull request #14110 from sethalves/fix-clang-7-build 
get interface building and working with clang-7 on ubuntu 18
 2018-10-01 16:32:39 -07:00
Brad Hefta-Gaub
6290b56383
Merge pull request #14079 from luiscuenca/simpleAvatarTransit 
Simple avatar transit
 2018-10-01 16:24:46 -07:00
Brad Hefta-Gaub
ef063a4072
Merge pull request #14026 from huffman/fix/edit-rotation 
Fix edit rotation handle fidgeting
 2018-10-01 16:15:32 -07:00
Brad Hefta-Gaub
8b03a21799
Merge pull request #14025 from ElderOrb/FB18061 
use current wearable index, not joint index!
 2018-10-01 16:14:33 -07:00
Wayne Chen
8f36bc0850
Merge pull request #4 from danteruiz/interstitialMerged 
Interstitial screen updates
 2018-10-01 15:43:04 -07:00
Dante Ruiz
66bb5f68d2 updating interstitialmode 2018-10-01 15:26:56 -07:00
amantley
90feeffa9d cleaning up. putting squat fix in vertical recenter 2018-10-01 14:21:00 -07:00
David Rowe
6ccd73ea47 Merge branch 'master' into M18586 2018-10-02 10:17:24 +13:00
SamGondelman
49553e0285 bake default skybox 2018-10-01 14:05:15 -07:00
Dante Ruiz
652ec2210d fixing loading issues 2018-10-01 13:58:14 -07:00
sabrina-shanman
b988382918 Remove smaller RayPick constructor 2018-10-01 11:07:02 -07:00
luiscuenca
5ccbc5c029 Disable Hand Touch when Leap Motion is running 2018-10-01 10:47:06 -07:00
Wayne Chen
189e7e15fe
Merge branch 'master' into fixMainTextContainerQML 2018-10-01 09:48:42 -07:00
Dante Ruiz
ad92b172cb removing comment 2018-10-01 09:47:07 -07:00
Dante Ruiz
31baa46ee0 merging from master 2018-10-01 09:44:54 -07:00
sabrina-shanman
7a89f959d1 Fix not mentioning pick parenting in all pick parenting jsdocs for 
parentID
 2018-10-01 09:34:21 -07:00
Wayne Chen
eab57633a5 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-01 09:21:26 -07:00
sabrina-shanman
0cf7e954cc Simplify a RayPick and StylusTip constructor 2018-10-01 09:20:59 -07:00
sabrina-shanman
f0de3ef31c jsdocs: Do not list scaleWithAvatar as separate property, and document 0 as default for parentJointIndex 2018-10-01 09:18:52 -07:00
sabrina-shanman
728f8aeecd Scale Parabola Pick acceleration before rotating it 2018-10-01 09:02:46 -07:00
amantley
1a0e2c6ea1 clean up for pr 2018-10-01 08:30:51 -07:00
amantley
9e40045927 added criteria to stop false positive for sit down 2018-09-30 17:13:34 -07:00
amantley
bdd6befef9 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-09-29 15:39:36 -07:00
David Rowe
9dfbaa9201 Remove "Reset Sensors" button from Settings > Controls 2018-09-29 14:17:55 +12:00
amantley
884ad66a14 added sensor space detection of height of the user in MyAvatar.cpp 1.2 * average sensor space height changes to standing. .833 sensorspace height changes to sitting. there is also a manual override in the avatar app settings now 2018-09-28 17:18:24 -07:00
Anthony Thibault
58df72af60 Merge branch 'master' into bug-fix/bad-avatar-pointer-static-cast 2018-09-28 16:32:12 -07:00
sabrina-shanman
f3f9976cfb Cache ParabolaPick speed 2018-09-28 16:10:17 -07:00
sabrina-shanman
b60a62da8f Move pathWidth variable in PathPointer back down to specialized classes 2018-09-28 16:04:34 -07:00
sabrina-shanman
0c3f55d6ef Code style for floating point literal 2018-09-28 15:39:37 -07:00
Zach Fox
59eabbbb5d Fix MS18608: Use new connections api endpoint 2018-09-28 14:28:50 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
Zach Fox
5b72e17981 Fix MS18154: Don't snap to cards in My Purchases 2018-09-28 11:33:22 -07:00
Howard Stearns
2d29906e3c Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-28 11:22:57 -07:00
Gabriel Calero
b7c421ba47 Fixes according to review 2018-09-28 14:39:15 -03:00
sabrina-shanman
8f2d3b17d3 Fix parabola scaling issues and raypick velocity denormalization due to transform affecting direction scale 2018-09-28 09:27:38 -07:00
David Rowe
1c4bde3e84 Fix build warnings 2018-09-28 18:38:38 +12:00
Kerry Ivan Kurian
440e2062f5 Fix application uninstall in marketplace item tester 2018-09-27 22:14:02 -07:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
David Rowe
f2c13f193c Don't jump in HMD mode unless option is set 2018-09-28 16:05:20 +12:00
David Rowe
868a3a9219 Tweak vertical spacing 2018-09-28 15:42:48 +12:00
David Rowe
45993ba475 Provide mini tablet details via API instead of messages 2018-09-28 14:23:08 +12:00
Bradley Austin Davis
3dea4fd10a Fix some Mac rendering issues 2018-09-27 19:21:50 -07:00