Dante Ruiz
d76a2c1add
disable interstitial by default and fix crash
2018-09-12 15:31:03 -07:00
Gabriel Calero
2943502c9b
Headset plug/unplug detection
2018-09-12 16:36:04 -03:00
Stephen Birarda
b1f44d2ad7
perform avatar entity cleanup in AvatarManager::handleRemovedAvatar
2018-09-12 12:30:15 -07:00
luiscuenca
fa3c6932c6
Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip
2018-09-12 11:47:18 -07:00
sabrina-shanman
d2c41f02e5
Avoid unnecessary type conversion in CollisionPick::getHUDIntersection
2018-09-12 10:36:00 -07:00
sabrina-shanman
87b5605d69
Add normalOnPick to CollisionPickResult
2018-09-12 10:36:00 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged
...
Interstitial Page with 404 Redirect
2018-09-12 08:39:52 -07:00
Wayne Chen
20cab87a17
Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-11 18:53:06 -07:00
Wayne Chen
30e9d57026
adding pattern for during timeout to put into error state
2018-09-11 18:52:28 -07:00
Wayne Chen
a7321f950a
pushing requested changes - adding timeout refusal
2018-09-11 18:32:17 -07:00
Brad Hefta-Gaub
d319bea2ac
Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb
...
Avatar loading orb now indicates loading status
2018-09-11 18:01:40 -07:00
Wayne Chen
2267085dbf
removing unused counter variable
2018-09-11 17:46:01 -07:00
Wayne Chen
cb0aa8055f
Merge pull request #13961 from wayne-chen/loginOnLaunch
...
Pop up login dialog on launch
2018-09-11 17:43:29 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
Wayne Chen
84f95dd4b8
updating typo
2018-09-11 17:03:06 -07:00
Wayne Chen
d4dfaec8ea
updating typo
2018-09-11 17:02:38 -07:00
Wayne Chen
d478fcf027
remove unused signal from domain handler
2018-09-11 17:01:14 -07:00
Wayne Chen
9ee21c9956
removing virtual keyword from destructor
2018-09-11 16:49:11 -07:00
Stephen Birarda
2c056e5b22
Merge pull request #13912 from birarda/bug/agent-clear-avatars
...
handle agent avatar clear on avatar mixer disconnect
2018-09-11 16:34:15 -07:00
Wayne Chen
490cdc901e
Merge pull request #3 from danteruiz/interstitalMerged
...
making requested changes and fixing compile issue for jenkins
2018-09-11 16:30:13 -07:00
Wayne Chen
0f25756908
expose domain connection error to Window
2018-09-11 16:29:39 -07:00
Dante Ruiz
c97d646083
making requested changes and fixing compile issue for jenkins
2018-09-11 15:57:44 -07:00
Anthony Thibault
23ed314250
Fix for missing return warning
2018-09-11 14:50:50 -07:00
Dante Ruiz
b665dbe13e
finished requested changes
2018-09-11 14:18:12 -07:00
Anthony Thibault
bc5d9a46a2
Avatar loading orb now indicates status
...
white - no url has been received yet for this avatar
purple - a url has been received for this avatar but it's content is still downloading/loading
blue - (only visible breifly) content has succesfully loaded
red - (only visible briefly) content has failed to download.
2018-09-11 13:12:46 -07:00
Wayne Chen
e7aef92e99
fixing logout bug from syntax reversion
2018-09-11 12:51:51 -07:00
luiscuenca
fedea6e84d
Comply with review comments
2018-09-11 12:23:25 -07:00
Wayne Chen
d69e536120
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-11 12:18:36 -07:00
Dante Ruiz
cc2c208b12
fix small issue
2018-09-11 12:12:31 -07:00
Dante Ruiz
735ff04fad
fixing merge conflicts
2018-09-11 12:10:19 -07:00
Dante Ruiz
5c9a88868d
first round of requested changes
2018-09-11 12:01:55 -07:00
Wayne Chen
800df1b077
Merge branch 'loginOnLaunch' of https://github.com/wayne-chen/hifi into loginOnLaunch
2018-09-11 11:02:16 -07:00
Wayne Chen
e931b661a5
login dialog pops up in HMD again
2018-09-11 11:00:39 -07:00
Wayne Chen
2a7e2af44f
syntax reversion + removing poppedUp var
2018-09-11 10:36:10 -07:00
Wayne Chen
84cf40f8aa
changing calculation of load percentage
2018-09-11 10:07:57 -07:00
Wayne Chen
aa62a89318
removing more logging for login dialog
2018-09-11 09:49:12 -07:00
Wayne Chen
9d7ba377ca
removing logging for login dialog
2018-09-11 09:42:53 -07:00
Wayne Chen
ee516fd79f
adding proper checking for saved username/login
2018-09-11 09:36:46 -07:00
Brad Hefta-Gaub
ab1718747b
Merge pull request #13970 from jherico/fix/fb18149
...
Ensure a web overlay doesn't access an invalid tabletScriptingInterface
2018-09-11 09:31:33 -07:00
Wayne Chen
6bcf6eaae7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-11 09:13:41 -07:00
Wayne Chen
69ae475787
adding user activity logging
2018-09-10 23:04:50 -07:00
Wayne Chen
5ece8d8707
using different paradigm for checking login dialog popup
2018-09-10 18:32:21 -07:00
Wayne Chen
28c3afca9d
adding back inlines
2018-09-10 17:40:35 -07:00
Wayne Chen
0290ea4bdc
Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-10 17:40:16 -07:00
Wayne Chen
fa3097225b
removing inlines - not allowed for unique_ptr
2018-09-10 17:33:32 -07:00
Wayne Chen
60a5b0eeaf
Merge pull request #1 from danteruiz/interstitalMerged
...
handle unable to connect to domain case
2018-09-10 17:23:50 -07:00
Wayne Chen
c194c236f1
adding inlines
2018-09-10 17:10:13 -07:00
Wayne Chen
a55849d24b
Merge branch 'interstitalMerged' into interstitalMerged
2018-09-10 17:08:45 -07:00
Wayne Chen
2381d6bc02
using REDIRECT_HIFI_ADDRESS
...
recycling existing, defined variable for error redirection
2018-09-10 17:07:49 -07:00
Wayne Chen
e5a87aa58c
removing unused variables
2018-09-10 16:56:13 -07:00
Dante Ruiz
de5a0a714b
handle unable to connect to domain case
2018-09-10 16:25:17 -07:00
Wayne Chen
dcacfdba7c
adding popup property to qml
2018-09-10 16:22:55 -07:00
SamGondelman
0e079e78e6
correct transparent parabola shader
2018-09-10 16:20:50 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms
...
Remove all uniforms from our shaders
2018-09-10 15:42:01 -07:00
Brad Davis
ba1ac7c180
Ensure a web overlay doesn't access an invalid tabletScriptingInterface
2018-09-10 15:07:15 -07:00
Wayne Chen
e7616c7d34
added logging + activity logging
2018-09-10 15:06:14 -07:00
luiscuenca
6f4e9ded09
Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip
2018-09-10 14:42:02 -07:00
sabrina-shanman
9a86b7451b
Add collision group parameter to collision pick and set my avatar as the default
2018-09-10 14:35:04 -07:00
Seth Alves
cb33222fea
Merge pull request #13886 from ctrlaltdavid/M17901
...
Improve HMD Menu page navigation
2018-09-10 11:34:21 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling
2018-09-10 10:15:49 -07:00
Wayne Chen
e721844b10
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-10 10:10:16 -07:00
luiscuenca
a9f676354b
Only invisible pointers and scale fix
2018-09-10 08:54:53 -07:00
Sam Gateau
983badf80a
Merge pull request #13663 from SamGondelman/lod
...
Enable LOD manager on android
2018-09-08 13:43:36 -07:00
Stephen Birarda
adac872a11
clear other avatars in agent on avatar mixer disconnect
2018-09-07 15:04:14 -07:00
Stephen Birarda
be57789ad8
Merge pull request #13931 from SimonWalton-HiFi/safe-landing-cleanup
...
Remove some debug logging left in the safe landing module
2018-09-07 14:58:00 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats
...
Move animation stats into its own Menu
2018-09-07 14:51:46 -07:00
luiscuenca
d09391faa5
Fix invisible error
2018-09-07 12:17:40 -07:00
luiscuenca
02065518cb
Merge branch 'master' of https://github.com/highfidelity/hifi into stt_teleport_wip
2018-09-07 11:57:48 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale
...
Scale Collision Pick to match parent
2018-09-07 11:54:02 -07:00
John Conklin II
2ac0377a6e
Merge pull request #13952 from amantley/steppingReboot
...
Fix for lurching walk(case 16945), when walking in hmd.
2018-09-07 11:43:03 -07:00
Sam Gondelman
57275422f2
Merge branch 'master' into lod
2018-09-07 10:01:26 -07:00
Simon Walton
741d4ba998
Merge branch 'master' into avatar-mixer-scaling
2018-09-07 09:30:39 -07:00
sabrina-shanman
8d4c47cf8e
Make template specialization of BaseNestableTransformNode explicit
2018-09-07 08:49:44 -07:00
Anthony Thibault
6508533a15
Remove anim stats from plain ole stats.
...
There are still present in anim stats tho.
2018-09-06 17:58:40 -07:00
Wayne Chen
72818f3729
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged
2018-09-06 17:37:36 -07:00
Wayne Chen
ef3449f96d
Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged
2018-09-06 17:36:47 -07:00
sabrina-shanman
7a9480723e
Remove unused variable in PickScriptingInterface::createTransformNode
2018-09-06 17:30:29 -07:00
Dante Ruiz
2f9119529a
editing the interstitial page
2018-09-06 17:06:17 -07:00
SamGondelman
ed7f993c0d
avatar mixer and manager perf improvements and cleanup
2018-09-06 16:57:20 -07:00
sabrina-shanman
23a6abbaca
Update jsdocs to reflect new collision pick scaling behavior
2018-09-06 16:47:09 -07:00
sabrina-shanman
836f810c41
Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code
2018-09-06 16:33:29 -07:00
Anthony Thibault
acc7f1f168
Moved AnimStats into its own qml panels.
...
Added state machine tracking as well.
2018-09-06 16:18:58 -07:00
Gabriel Calero
2d2a4804f7
Add android settings screen. Add AEC setting
2018-09-06 17:49:52 -03:00
amantley
90a51e6181
added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area
2018-09-06 13:12:48 -07:00
sabrina-shanman
714cfc5ef1
Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc
2018-09-06 12:14:50 -07:00
sabrina-shanman
727b62144f
Fix MyAvatarHeadTransformNode not using avatar scale
2018-09-06 12:03:13 -07:00
Dante Ruiz
ec2d89fd25
fixing toolbar disappering
2018-09-06 11:16:58 -07:00
sabrina-shanman
7839ba42db
Make the Collision Pick threshold scale with the largest dimension of the parent
2018-09-06 11:02:07 -07:00
sabrina-shanman
3f7a7fb11a
Return early from AvatarTransformNode and similar when getTransform fails
2018-09-06 10:29:01 -07:00
sabrina-shanman
e8ea95e375
Use elseifs in PickScriptingInterface::createTransformNode
2018-09-06 10:21:48 -07:00
sabrina-shanman
390e89a64d
Fix missing NestableTransformNode import
2018-09-06 10:20:26 -07:00
sabrina-shanman
f7226757ad
Just import TransformNode in AvatarTransformNode.h and similar
2018-09-06 10:03:05 -07:00
Dante Ruiz
200f6d540a
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-09-06 09:59:51 -07:00
Seth Alves
042044ceaf
dammit
2018-09-06 09:38:12 -07:00
Seth Alves
5a0a259c21
dammit
2018-09-06 09:37:01 -07:00
Seth Alves
69ae04ab09
protect Base3DOverlay::_name with a mutex
2018-09-06 09:03:28 -07:00
Brad Davis
105a615745
Fix no-ui crashes
2018-09-06 08:59:05 -07:00
Wayne Chen
581aa0c02d
Merge branch 'fly-login-upon-launch' of https://github.com/sethalves/hifi into loginOnLaunch
2018-09-05 20:04:34 -07:00
Anthony Thibault
3a3ffcc98c
First pass at improving anim stats.
2018-09-05 18:14:06 -07:00
amantley
6fb335429d
starting to re-implement the walking state detection for smoothwalking
2018-09-05 17:55:27 -07:00
