Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 16:36:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72789 commits 25 branches 0 tags 1.1 GiB
Commit graph

72789 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
sabrina-shanman
237022d304 Refactor new pick parenting system for use with RayPick, ParabolaPick 2018-09-14 10:28:15 -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
Gabriel Calero
cb49635627 Fix switch from Top View to My View 2018-09-14 13:34:04 -03: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
David Rowe
45281960af Don't display mini tablet if user is away 2018-09-14 20:30:17 +12:00
David Rowe
80aa74600f Fix mini tablet sometimes remaining parented when it shouldn't be 2018-09-14 20:15:08 +12:00
David Rowe
ba56457663 Smooth the transition between expanded mini tablet and tablet proper 2018-09-14 20:14:54 +12:00
SamGondelman
c522d1bc93 merge with master 2018-09-14 00:57:13 -07:00
Sam Gateau
eccca053f9 Clean changes 2018-09-13 23:58:40 -07:00
David Rowe
f01ebe57ea Trial hiding the UI when it's expanding to become the tablet proper 2018-09-14 18:55:29 +12: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
NissimHadar
46b00535c8 Running all night. 2018-09-13 22:59:54 -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
Simon Walton
727aea2025 Remove comment 2018-09-13 18:21:16 -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
David Rowe
fe8c237d64 Don't display mini tablet in peripheral vision 2018-09-14 11:22:31 +12:00
David Rowe
c27bb04596 Display mini tablet when it or palm is facing the camera 2018-09-14 11:10:26 +12:00
Wayne Chen
77d5ebf34f
changing button URL - typo 2018-09-13 15:47:25 -07:00
Gabriel Calero
5795ef3c63 Fix qt build (osx) file version 2018-09-13 19:43:28 -03: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
0fc1cc9af8 Revert "adding fix for getting DomainHandler into error state" 
This reverts commit 49f26d968a.
 2018-09-13 15:39:18 -07:00
Wayne Chen
db1acb87b8 button was clipped; adding higher res img 2018-09-13 15:38:24 -07:00
David Rowe
bbfb2b1374 Merge branch 'master' into M17428-f 2018-09-14 10:36:49 +12:00
NissimHadar
35eb019524 Can run installer in a thread. 2018-09-13 15:34:10 -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