Wayne Chen
b4b0c519f3
Merge branch 'master' into fixGoToButtonInterstitial
2018-09-13 17:11:34 -07:00
John Conklin II
aef3ed3e01
Merge pull request #13989 from wayne-chen/fixLoginFailTwiceCall
...
Fix login fail twice call
2018-09-13 16:59:00 -07:00
Wayne Chen
b49e3377b6
Revert "adding fix for getting DomainHandler into error state"
...
This reverts commit 49f26d968a
2018-09-13 15:40:01 -07:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor
...
Fixing Error State for Timeout/localhost Redirection
2018-09-13 15:19:55 -07:00
Wayne Chen
647c4e1694
adding true fix for localhost timeouts
2018-09-13 13:51:42 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling
...
Performance improvements for Avatar Mixer
2018-09-13 13:43:18 -07:00
John Conklin II
28140fc0c0
Merge pull request #13988 from sabrina-shanman/crash_bubble-tp
...
Fix crash when teleporting into avatars with bubble active
2018-09-13 13:07:31 -07:00
Wayne Chen
873859455a
Revert "adding fix for getting DomainHandler into error state"
...
This reverts commit 3fe3f674d0
2018-09-13 11:53:56 -07:00
Wayne Chen
380f24b37f
adding fix, changing window title
2018-09-13 11:53:21 -07:00
sabrina-shanman
f3d86cfc7d
Fix crash when teleporting into avatars with bubble active
2018-09-13 10:51:53 -07:00
Wayne Chen
96ab7d417e
removing connection for on login failed
2018-09-13 10:35:43 -07:00
Wayne Chen
bcd014ddc8
Merge branch 'master' of https://github.com/highfidelity/hifi into fixLoopingConnectionMonitor
2018-09-13 10:29:02 -07:00
Wayne Chen
9a657559ef
Merge branch 'master' of https://github.com/wayne-chen/hifi
2018-09-13 09:52:20 -07:00
Bradley Austin Davis
d90551ac3e
Merge pull request #13954 from jherico/fix/reduce_pointer_duplication
...
Reduce needless smart pointer duplication
2018-09-13 08:56:50 -07:00
Wayne Chen
47b5ce706e
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-09-13 07:09:00 -07:00
Sam Gateau
6285487214
Merge pull request #13976 from SamGondelman/crash
...
Blendshape fixes
2018-09-12 22:19:44 -07:00
Wayne Chen
ad233677b8
adding changes for overriding host change for error state
2018-09-12 18:31:01 -07:00
Wayne Chen
3fe3f674d0
adding fix for getting DomainHandler into error state
2018-09-12 15:45:06 -07:00
Wayne Chen
49f26d968a
adding fix for getting DomainHandler into error state
2018-09-12 15:42:55 -07:00
SamGondelman
2b2091290e
fix everything
2018-09-12 15:32:35 -07:00
Brad Davis
d92c62c742
Make android use the existing shared pointers
2018-09-12 15:04:36 -07:00
Brad Davis
700c6519bf
More PR comments
2018-09-12 15:04:36 -07:00
Brad Davis
37cf37e3e1
PR feedback
2018-09-12 15:04:36 -07:00
Brad Davis
cfff28ad0a
More shared pointer deduplication
2018-09-12 15:04:35 -07:00
Brad Davis
9a435cdca2
Reduce needless smart pointer duplication
2018-09-12 15:04:35 -07:00
Stephen Birarda
b1f44d2ad7
perform avatar entity cleanup in AvatarManager::handleRemovedAvatar
2018-09-12 12:30:15 -07:00
Stephen Birarda
1789d51d6e
Revert "cycle avatar entity IDs for new avatar mixer"
...
This reverts commit 20912349a4
2018-09-12 12:22:07 -07:00
Stephen Birarda
6d3e6a661f
Revert "XOR incoming trait instance IDs for other avatars"
...
This reverts commit 9b3d9dd0f3
2018-09-12 12:20:31 -07:00
Stephen Birarda
4b93f9f5cd
Revert "use different XORed instance ID for replicas"
...
This reverts commit a37a19da1e
2018-09-12 12:20:03 -07:00
Simon Walton
7136698c6b
Move default pose flags out of joint-positions condition
2018-09-12 10:49:26 -07:00
Simon Walton
0d72e3808c
Small changes per review
2018-09-12 10:31:26 -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
Sam Gateau
f79c92b4ff
Merge pull request #13974 from samcake/black-ter
...
Fix a missing std::chrono::duration_cast
2018-09-12 08:27:19 -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
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
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
8bca1bc5fe
reverting, oversight
2018-09-11 17:09:21 -07:00
Wayne Chen
a85a7a6119
adding back goToLastAddress back
2018-09-11 17:07:49 -07:00
Simon Walton
15f06264f9
Remove unneeded #include
2018-09-11 17:03:39 -07:00
SamGondelman
1a36693161
I hate blendshapes
2018-09-11 16:58:38 -07:00
Simon Walton
2a0ee1c532
Cherry-pick of commit cde2dc2e to fix merge issue
2018-09-11 16:58:21 -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
sam gateau
8c7781a6d4
use the std::chrono duration the way it should be
2018-09-11 15:57:57 -07:00
Dante Ruiz
c97d646083
making requested changes and fixing compile issue for jenkins
2018-09-11 15:57:44 -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
