John Conklin II
|
49e578ebef
|
Merge pull request #13998 from AndrewMeadows/dont-zero-kinematic
don't zero kinematic velocities when releasing simulation ownership
|
2018-09-14 15:18:06 -07:00 |
|
John Conklin II
|
65ef04ae75
|
Merge pull request #13937 from luiscuenca/stt_teleport_wip
Safe Teleport Target
|
2018-09-14 15:11:18 -07:00 |
|
luiscuenca
|
04e6225a95
|
Threshold back
|
2018-09-14 11:22:47 -07:00 |
|
luiscuenca
|
8c9173b639
|
Safe landing for discrepancies
|
2018-09-14 11:06:30 -07:00 |
|
David Back
|
86972cf4fb
|
Merge pull request #13992 from dback2/entityListSearchCase
Fix entity list search case-sensitivity and allow id search
|
2018-09-14 10:58:44 -07:00 |
|
Andrew Meadows
|
9390687e2d
|
remove redundant EntityMotionState::updateSendVelocities() call
|
2018-09-14 10:37:55 -07:00 |
|
Andrew Meadows
|
9073e1ade3
|
don't zero kinematic velocity at end of sim ownership
|
2018-09-14 10:37:17 -07:00 |
|
Howard Stearns
|
4378f5bf1c
|
Merge pull request #13996 from howard-stearns/text-tuning-for-wallet-setup-cta
Text tuning for wallet setup call to action
|
2018-09-14 10:17:22 -07:00 |
|
David Back
|
296e2ba488
|
lowercase search term at start
|
2018-09-14 09:57:27 -07:00 |
|
David Back
|
30f0bd577a
|
Merge branch 'entityListSearchCase' of github.com:dback2/hifi into entityListSearchCase
|
2018-09-14 09:42:44 -07:00 |
|
David Back
|
a45be897ec
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase
|
2018-09-14 09:42:04 -07:00 |
|
Sam Gateau
|
81a69c7769
|
Merge pull request #13995 from samcake/black
Attempt to fix LOD setting getting stuck
|
2018-09-14 09:31:35 -07:00 |
|
sam gateau
|
b35f09fead
|
Address review comments
|
2018-09-14 08:43:35 -07:00 |
|
howard-stearns
|
685b2978ce
|
Text tuning for wallet setup call to action
|
2018-09-14 08:26:25 -07:00 |
|
John Conklin II
|
44041fcc14
|
Merge pull request #13986 from Atlante45/fix/ess-crash
Fix ESS crash caused by concurrent access to _entityScripts
|
2018-09-14 07:56:45 -07:00 |
|
Sam Gateau
|
eccca053f9
|
Clean changes
|
2018-09-13 23:58:40 -07:00 |
|
Sam Gateau
|
1438643a5f
|
Adding extra sanity checks on all time dependant values to avoid bad behavior maybe
|
2018-09-13 23:48:50 -07:00 |
|
unknown
|
f9480c24a5
|
store search term lower
|
2018-09-13 20:07:49 -07:00 |
|
unknown
|
ae2005b8c4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase
|
2018-09-13 19:37:16 -07:00 |
|
Wayne Chen
|
568b5b9142
|
Merge pull request #13991 from wayne-chen/fixGoToButtonInterstitial
Fix GOTO TheSpot Button in Interstitial Page
|
2018-09-13 18:46:10 -07:00 |
|
luiscuenca
|
fb37e13aae
|
fix hat stand fail
|
2018-09-13 18:21:22 -07:00 |
|
David Back
|
b65bd6736f
|
also allow search using entity id
|
2018-09-13 18:20:11 -07:00 |
|
David Back
|
c5b5a5e8c1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase
|
2018-09-13 18:03:13 -07:00 |
|
Wayne Chen
|
79cf1cb612
|
Merge pull request #13993 from highfidelity/revert-13989-fixLoginFailTwiceCall
Revert "Fix login fail twice call"
|
2018-09-13 17:49:06 -07:00 |
|
Wayne Chen
|
53582bddcd
|
pushing more changes
|
2018-09-13 17:26:08 -07:00 |
|
Wayne Chen
|
bf7dd94db7
|
button was clipped; adding higher res img
|
2018-09-13 17:25:33 -07:00 |
|
Wayne Chen
|
2b8aebdb6b
|
Revert "Merge branch 'master' into fixGoToButtonInterstitial"
This reverts commit b4b0c519f3, reversing
changes made to aef3ed3e01.
|
2018-09-13 17:21:29 -07:00 |
|
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 |
|
Wayne Chen
|
fd1e64e4e6
|
Revert "Fix login fail twice call"
|
2018-09-13 17:01:59 -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 |
|
luiscuenca
|
c5669ef1f5
|
better property names
|
2018-09-13 15:22:18 -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 |
|
Clement
|
e6b4ccef16
|
Add lock around _entityScripts
|
2018-09-13 15:10:16 -07:00 |
|
luiscuenca
|
6a9a898b62
|
make updateCollisionCapsule private
|
2018-09-13 15:07:34 -07:00 |
|
David Back
|
4bc046187a
|
fix searching case-sensitivity
|
2018-09-13 15:06:14 -07:00 |
|
luiscuenca
|
ceccc6d6ec
|
make getCollisionCapsule thread safe
|
2018-09-13 14:49:35 -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 |
|