Wayne Chen
|
40451a1fc1
|
Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial""
This reverts commit c5468fd8e9.
|
2018-09-13 17:21:07 -07:00 |
|
Wayne Chen
|
c5468fd8e9
|
Revert "Merge branch 'master' into fixGoToButtonInterstitial"
This reverts commit b4b0c519f3, reversing
changes made to 77d5ebf34f.
|
2018-09-13 17:18:49 -07:00 |
|
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
|
77d5ebf34f
|
changing button URL - typo
|
2018-09-13 15:47:25 -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 |
|
Wayne Chen
|
db1acb87b8
|
button was clipped; adding higher res img
|
2018-09-13 15:38:24 -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 |
|
John Conklin II
|
8e5f2d0e08
|
Merge pull request #13983 from danteruiz/disable-interstitial
disable interstitial by default and fix crash
|
2018-09-13 14:01:28 -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 |
|
David Back
|
5c4901facd
|
Merge pull request #13982 from dback2/centerScaleCubeHMD
HMD Edit Handles - add highlighting and fix center scale cube
|
2018-09-13 10:45:00 -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 |
|
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 |
|
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 |
|
Dante Ruiz
|
dca34c7cbe
|
remove warning for GCC
|
2018-09-13 08:32:47 -07:00 |
|
Wayne Chen
|
47b5ce706e
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2018-09-13 07:09:00 -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 |
|
David Back
|
7768e08510
|
rename func
|
2018-09-12 16:06:14 -07:00 |
|
David Back
|
06504ade88
|
Merge branch 'master' of https://github.com/highfidelity/hifi into centerScaleCubeHMD
|
2018-09-12 16:04:22 -07:00 |
|
David Back
|
1b8e9ed906
|
get controller position from avatar frame
|
2018-09-12 16:02:43 -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 |
|
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 |
|
Dante Ruiz
|
d76a2c1add
|
disable interstitial by default and fix crash
|
2018-09-12 15:31:03 -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 |
|
David Back
|
55a4c55f78
|
remove unused and rename var
|
2018-09-12 14:48:27 -07:00 |
|
David Back
|
3da442a8f9
|
allow highlights in hmd, fix center scale hmd math
|
2018-09-12 14:44:04 -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 |
|
David Back
|
cf1c1296a7
|
fix center scale cube in hmd
|
2018-09-12 11:44:26 -07:00 |
|
Wayne Chen
|
521361293a
|
moving comment locations inside conditionals
|
2018-09-12 11:03:00 -07:00 |
|