Wayne Chen
|
380f24b37f
|
adding fix, changing window title
|
2018-09-13 11:53:21 -07:00 |
|
Wayne Chen
|
bcd014ddc8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixLoopingConnectionMonitor
|
2018-09-13 10:29:02 -07:00 |
|
Seth Alves
|
36886ca9b8
|
Merge pull request #13985 from wayne-chen/fixLoggingForEncourageLogin
Fixing user activity logging for encourage login
|
2018-09-13 09:56:42 -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
|
5902699870
|
adding updated models for redirect
|
2018-09-12 22:54:23 -07:00 |
|
Sam Gateau
|
6285487214
|
Merge pull request #13976 from SamGondelman/crash
Blendshape fixes
|
2018-09-12 22:19:44 -07:00 |
|
Wayne Chen
|
fc007982e0
|
muting opt out activity if login fail/success
|
2018-09-12 21:25:41 -07:00 |
|
Wayne Chen
|
ad233677b8
|
adding changes for overriding host change for error state
|
2018-09-12 18:31:01 -07:00 |
|
Wayne Chen
|
be650d5af0
|
changing when to log - there is broken code in bodyLoader
|
2018-09-12 16:00:43 -07:00 |
|
Wayne Chen
|
3fe3f674d0
|
adding fix for getting DomainHandler into error state
|
2018-09-12 15:45:06 -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 |
|
Seth Alves
|
d5456eda6c
|
Merge pull request #13980 from birarda/bug/parented-traited-entities
revert avatar entity XORing, perform avatar entity cleanup in handleRemovedAvatar
|
2018-09-12 14:29:39 -07:00 |
|
John Conklin II
|
e243792cac
|
Merge pull request #13623 from wayne-chen/fixGrabWebSurface-case-16192
MS16192: Fix Near Grabbing After Using Web Entity
|
2018-09-12 12:50:44 -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 |
|
Wayne Chen
|
521361293a
|
moving comment locations inside conditionals
|
2018-09-12 11:03:00 -07:00 |
|
Wayne Chen
|
acf34dcfdf
|
one more unused variable
|
2018-09-12 10:58:05 -07:00 |
|
Wayne Chen
|
8bef0d0de4
|
removing unused variables
|
2018-09-12 10:55:40 -07:00 |
|
Wayne Chen
|
a96e78c72d
|
removing debug
|
2018-09-12 10:54:38 -07:00 |
|
Wayne Chen
|
b9f0af63e1
|
changing check for near grabbing modules - fixes grabbing for dynamic
|
2018-09-12 10:38:21 -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
|
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
|
045ac4cb0d
|
allowing grip button for interrupting web scroll
|
2018-09-11 17:43:03 -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 |
|
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 |
|
SamGondelman
|
1a36693161
|
I hate blendshapes
|
2018-09-11 16:58:38 -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 |
|
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 |
|
Wayne Chen
|
b6c5ae2a68
|
staging changes
|
2018-09-11 15:23:40 -07:00 |
|