Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-19 02:41:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72789 commits 72 branches 59 tags 1.2 GiB
Commit graph

27167 commits

Author SHA1 Message Date
luiscuenca
82b08f1a93 Wait until skeleton is loaded to locate the avatar 2018-09-25 16:21:05 -07:00
John Conklin II
19438d143e
Merge pull request #14073 from jherico/fix/18069_test 
Working on Vive shutdown issues
 2018-09-25 15:41:32 -07:00
Kerry Ivan Kurian
276125937c Eliminate double equals 2018-09-25 15:18:12 -07:00
Kerry Ivan Kurian
4e7b03883f Use triple equals 2018-09-25 15:13:26 -07:00
Roxanne Skelly
cbb4bff2db Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-25 14:16:43 -07:00
sabrina-shanman
55ab0a394b Return std::make_shared 2018-09-25 12:21:22 -07:00
sabrina-shanman
6e83e96d1c Check type in Pointer::getPickResultCopy 2018-09-25 12:05:47 -07:00
Wayne Chen
1394d06480 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements 2018-09-25 10:52:47 -07:00
sabrina-shanman
660bdf36d0 Check if pick result is null when building visual pick result 2018-09-25 09:56:51 -07:00
luiscuenca
1e34d3aa35 Remove not needed code 2018-09-25 09:22:33 -07:00
sabrina-shanman
8dd36e465b Merge branch 'master' into crash_ray-pick-dtor_pointer-only 2018-09-25 09:22:30 -07:00
sabrina-shanman
eca31e7a99 Fix instantiating abstract class when creating visual pick result for pointers 2018-09-25 09:20:57 -07:00
luiscuenca
af2935187b Fix warnings 2018-09-25 08:32:43 -07:00
luiscuenca
0676f25e31 Save transit preferences 2018-09-25 07:42:28 -07:00
luiscuenca
80daf35e77 Animation and particles clean up 2018-09-25 07:17:26 -07:00
luiscuenca
3e2ee119f0 API to configure animation and particle effect 2018-09-25 06:03:29 -07:00
Kerry Ivan Kurian
ff83713365 Use persistent object id counter 2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian
ca1da9c830 Implement delete-from-list functionality in marketplace item tester 2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian
505e08b841 Resolve merge conflicts 2018-09-25 00:57:43 -07:00
David Rowe
af1b4fef5d Modify layout of rotation mode settings options 2018-09-25 18:03:57 +12:00
Kerry Ivan Kurian
0a43c17ce0 Use entity-specific glyphs in marketplace item tester 2018-09-24 21:15:08 -07:00
John Conklin II
be23d07621
Merge pull request #14010 from sethalves/thread-safe-settings 
make settings thread safe
 2018-09-24 17:24:50 -07:00
David Rowe
06b4f51a08 Misc fixes 2018-09-25 11:33:08 +12:00
Kerry Ivan Kurian
697f556a60 Persist list of marketplace items in test 
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
 2018-09-24 16:30:49 -07:00
Andrew Meadows
a3f946dee1 activate OtherAvarar in physics sim on position change 2018-09-24 16:27:37 -07:00
David Rowe
90ef109476 Remove superseded Pointers API functions 2018-09-25 11:11:53 +12:00
Dante Ruiz
57ae8ff8a1 update interstitial page stability count and loading bar 2018-09-24 16:09:53 -07:00
Roxanne Skelly
c1d2f00c9b Fix url.toString() 2018-09-24 15:45:38 -07:00
Wayne Chen
69d5299362 patching fix for previous commits 2018-09-24 15:22:46 -07:00
Brad Davis
72fc686ec1 Fix timer managmement during shutdown 2018-09-24 14:52:13 -07:00
Roxanne Skelly
16dba169c5 Tray Notifier code review fixes 2018-09-24 14:36:54 -07:00
Howard Stearns
2b1e581571 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-24 14:01:42 -07:00
Wayne Chen
ac5814a1f8 Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect 2018-09-24 13:57:23 -07:00
John Conklin II
a602bff217
Merge pull request #13981 from gcalero/android_settings 
Android settings (AEC)
 2018-09-24 13:55:30 -07:00
Howard Stearns
d3391b9273 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-24 13:50:52 -07:00
Roxanne Skelly
6f4c376d9f Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-24 13:45:24 -07:00
Roxanne Skelly
d5baadbefa Modify --url hifiapp: behavior to trigger through appUI when first 
starting interface.

Also, menu names and order follow UX documentation.
 2018-09-24 13:43:55 -07:00
Andrew Meadows
c1d65f5118 update avatar shape after it loads 2018-09-24 12:07:08 -07:00
John Conklin II
d520152a95
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements 
Small Improvements to Anim Stats
 2018-09-24 11:56:01 -07:00
Anthony Thibault
b467267e40 Fix for bad static_pointer_cast on exit. 
Identified by Address Sanatizer on Linux.

On exit ~Applicaiton calls AvatarManager::deleteAllAvatars.  This iterates over all avatars remaining in the _avatarHash.
Typically this includes the MyAvatar instance.  In this case the previous code would attempt to static cast an AvatarData pointer to an instance
of OtherAvatar.  This might be harmless, but could also lead hard to diagnose issues such as memory corruption.
 2018-09-24 11:47:05 -07:00
luiscuenca
012cd207b3 No data sent during basic transit 2018-09-24 11:39:10 -07:00
Stephen Birarda
b31837168d fix bad lock, optimize some operations, clarify comment 2018-09-24 11:27:20 -07:00
David Rowe
e29b403abc Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/raypick/PointerScriptingInterface.cpp
#	interface/src/raypick/PointerScriptingInterface.h
#	interface/src/raypick/StylusPointer.h
#	libraries/pointers/src/Pointer.h
#	scripts/system/controllers/controllerModules/teleport.js
 2018-09-24 11:44:28 +12:00
luiscuenca
82b14b6e9b Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport 2018-09-22 05:47:05 -07:00
luiscuenca
01f87a0645 lerp myavatar 2018-09-22 05:34:17 -07:00
Seth Alves
86e502637e Make Settings thread safe 2018-09-21 15:46:35 -07:00
Wayne Chen
3f9c8a266d reszing unameField/showing flavorText 2018-09-21 14:36:13 -07:00
Dante Ruiz
d3368146ce saving work 2018-09-21 11:42:26 -07:00
Gabriel Calero
f4be767d22 Android sign up 2018-09-21 14:58:11 -03:00
Zach Fox
e75a45af92 Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-21 09:43:30 -07:00
Alexander Ivash
1461fdf350 FB17835 - On clean installs, default avatarbookmarks.json file is read-only; bookmarks reset every launch until replaced or unmarked 2018-09-21 12:19:23 +03:00
luiscuenca
a7a128f1f1 Particle effect and ease movement 2018-09-20 18:37:42 -07:00
Kerry Ivan Kurian
f9c25f2f32 Allow user to select asset type in marketplace item tester 2018-09-20 16:36:06 -07:00
Roxanne Skelly
6e051b7431 Checkpoint tray notifications 
* Fix app launch
* refactor notifications code
* fixup wording
 2018-09-20 15:55:35 -07:00
David Rowe
5719b7020d Merge branch 'master' into M17428-f 2018-09-21 10:47:56 +12:00
Kerry Ivan Kurian
c1cc031bd0 Remove cruft and refactor 2018-09-20 14:50:27 -07:00
Wayne Chen
3907eaf68f changing show password image 2018-09-20 14:40:19 -07:00
Kerry Ivan Kurian
ae4352f450 Rez entity in marketplace item tester 2018-09-20 13:55:22 -07:00
Kerry Ivan Kurian
afa8e44e66 Refactor 2018-09-20 10:53:32 -07:00
Wayne Chen
8770c363df change button text to have a space 2018-09-19 17:02:05 -07:00
Howard Stearns
391128ef77 Merge branch 'followWalletSetupReferrer' of github.com:zfox23/hifi into account-managed-wallet-punchlist2 2018-09-19 16:46:09 -07:00
luiscuenca
cad8425c7b Time-based frames, max distance and setting animation from script 2018-09-19 16:43:45 -07:00
Zach Fox
ed84b49ece Small bugfixes and using original endpoints 2018-09-19 16:15:59 -07:00
Kerry Ivan Kurian
5445d6f670 Switch to localhost before replacing content 2018-09-19 16:06:43 -07:00
Howard Stearns
d644a63990 consistent/usefull checkout flow when you don't have enough money. 2018-09-19 16:00:40 -07:00
Kerry Ivan Kurian
38fd9523ee Attempt to load content set 
This does not result in the user seeing the content set.
 2018-09-19 15:57:29 -07:00
Kerry Ivan Kurian
66bf45c3ef Update location only if certificate id 2018-09-19 15:18:18 -07:00
Kerry Ivan Kurian
5bc7d944f9 Remove whitespace 2018-09-19 15:17:13 -07:00
Ryan Huffman
431daecd8e Fix shifting of yaw rotation handle 2018-09-19 14:33:51 -07:00
Wayne Chen
7e796f7e7f committing requested changes 2018-09-19 14:26:30 -07:00
Roxanne Skelly
aba183b165 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-19 13:40:18 -07:00
Ryan Huffman
788c883c02 Fix Circle3DOverlay not rendering solid circle to exact degrees 2018-09-19 13:38:35 -07:00
Alexander Ivash
e5b7b7f12a FB18061 - Avatar favorites cannot be moved to a different joint - At Save the wearable jumps to the original joint 2018-09-19 23:07:21 +03:00
Wayne Chen
4ce942b0f2 updating spawn location/floor in redirect 2018-09-19 13:00:56 -07:00
Roxanne Skelly
d5f756c79d Tray Notifier Checkpoint 
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
 2018-09-19 12:40:15 -07:00
John Conklin II
3b1e0dc7d9
Merge pull request #13987 from zfox23/discovery_appUi 
Discovery Notifications Project Checkpoint: Discovery apps now use AppUI module; PEOPLE app notifications
 2018-09-19 12:38:28 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola 
Correct transparent parabola shader
 2018-09-19 11:46:24 -07:00
Wayne Chen
a43799fffa moving settings check within slotted functions 2018-09-19 10:40:49 -07:00
Wayne Chen
795580f4e1 adding 404 redirect toggle with interstitial 2018-09-19 09:55:15 -07:00
Stephen Birarda
3a7785d10f fix for deadlock in other avatar entity removal 2018-09-18 17:52:24 -07:00
Zach Fox
55a0f77697 Notifications for MARKET 2018-09-18 14:45:14 -07:00
Kerry Ivan Kurian
cfa9d185f0 Add full resource paths to list in marketplace item tester 2018-09-18 14:02:16 -07:00
Kerry Ivan Kurian
a592565b7b Enable marketplace item test for avatar file 2018-09-18 13:25:01 -07:00
luiscuenca
96e8b060eb Enable transit animations 2018-09-18 12:42:37 -07:00
Kerry Ivan Kurian
645ad2bb7a Enable marketplace item test for avatar url 2018-09-18 12:36:03 -07:00
Kerry Ivan Kurian
8f5923d562 Show installed apps on start of marketplace item tester 
Also, refactor a bit.
 2018-09-18 11:23:32 -07:00
Wayne Chen
4807b5af7b fixing display of user/pw incorrect 2018-09-18 09:57:26 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
Anthony Thibault
8229c14c44
Fix for type in AnimStats.qml 2018-09-17 15:17:43 -07:00
Alexia Mandeville
5c9d31688f Adding handshake control to image 2018-09-17 14:01:23 -07:00
luiscuenca
f339bbdd7f Fix bug while walking 2018-09-17 13:29:04 -07:00
Zach Fox
23fab0985b Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-17 11:11:21 -07:00
Anthony Thibault
11fe657c05 Swaped AnimVar and StatMachine panels 2018-09-17 10:33:04 -07:00
luiscuenca
ff319ebd95 Bypass position updates from mixer 2018-09-17 09:47:22 -07:00
John Conklin II
be76c43aec
Merge pull request #13999 from gcalero/dont_popup_login_android 
Don't popup login dialog in android
 2018-09-14 16:06:03 -07:00
John Conklin II
cb8e3c6452
Merge pull request #14003 from danteruiz/snap-fix 
Fix snapshot settings issue in HMD
 2018-09-14 15:34:22 -07:00
Zach Fox
68e6142f8b Follow wallet setup referrer when autogenerating new wallet 2018-09-14 15:34:00 -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
Anthony Thibault
b0cde2afcc Small addition to Anim Stats 
* During a state machine interp the previous state now shows up in AlphaValues panel, with parentheses around the name.
* Added 3 new fields
  * Position - in world coordinate frame.
  * Heading - the facing angle in the world corrdinate frame.
  * Local Vel - the velocity of the character in the local coordinate frame. (left, forward, up).
 2018-09-14 15:05:17 -07:00
Zach Fox
9c5544af39 Merge in big work from appui_notifications branch 2018-09-14 14:37:04 -07:00
Zach Fox
9e50904376 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-14 14:36:22 -07:00
Dante Ruiz
ff52639bc3 fix update 2018-09-14 14:10:36 -07:00
Dante Ruiz
4eb5c9714b fix snapshot settings 2018-09-14 12:59:28 -07:00
Gabriel Calero
72eeeac2ba Don't popup login dialog in android 2018-09-14 14:40:30 -03:00
sabrina-shanman
237022d304 Refactor new pick parenting system for use with RayPick, ParabolaPick 2018-09-14 10:28:15 -07:00
sam gateau
b35f09fead Address review comments 2018-09-14 08:43:35 -07: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
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
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
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
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
luiscuenca
6a9a898b62 make updateCollisionCapsule private 2018-09-13 15:07:34 -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
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
Dante Ruiz
dca34c7cbe remove warning for GCC 2018-09-13 08:32:47 -07:00
Wayne Chen
5902699870 adding updated models for redirect 2018-09-12 22:54:23 -07:00
Wayne Chen
fc007982e0 muting opt out activity if login fail/success 2018-09-12 21:25:41 -07:00
luiscuenca
b517808bc2 Fix smaller size avatar capsule and land on detailed mesh 2018-09-12 21:24:19 -07:00
Wayne Chen
be650d5af0 changing when to log - there is broken code in bodyLoader 2018-09-12 16:00:43 -07:00
Zach Fox
01073ca18d Lots of changes; marketplaces.js working now 2018-09-12 15:46:17 -07:00
Dante Ruiz
d76a2c1add disable interstitial by default and fix crash 2018-09-12 15:31:03 -07:00
Gabriel Calero
2943502c9b Headset plug/unplug detection 2018-09-12 16:36:04 -03:00
Stephen Birarda
b1f44d2ad7 perform avatar entity cleanup in AvatarManager::handleRemovedAvatar 2018-09-12 12:30:15 -07:00
luiscuenca
fa3c6932c6 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-12 11:47:18 -07:00
sabrina-shanman
d2c41f02e5 Avoid unnecessary type conversion in CollisionPick::getHUDIntersection 2018-09-12 10:36:00 -07:00
sabrina-shanman
87b5605d69 Add normalOnPick to CollisionPickResult 2018-09-12 10:36:00 -07:00
luiscuenca
b9fbcce403 init frames per meter 2018-09-12 10:15:00 -07:00
luiscuenca
4d381b9d04 Smooth other avatars positions 2018-09-12 10:01:41 -07:00
Zach Fox
de2548d926 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-12 09:30:00 -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
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
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -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
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
Dante Ruiz
c97d646083 making requested changes and fixing compile issue for jenkins 2018-09-11 15:57:44 -07:00
Anthony Thibault
23ed314250 Fix for missing return warning 2018-09-11 14:50:50 -07:00
David Rowe
de95ee0a18 Merge branch 'master' into M17428-f 2018-09-12 09:49:29 +12:00
Dante Ruiz
b665dbe13e finished requested changes 2018-09-11 14:18:12 -07:00
Seth Alves
3b3006efb0
Merge pull request #13911 from ElderOrb/FB17982_master 
Avatar App: stop reloading existing selected bookmarks on app relaunch (master)
 2018-09-11 14:04:19 -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
Wayne Chen
e7aef92e99 fixing logout bug from syntax reversion 2018-09-11 12:51:51 -07:00
Zach Fox
ea04ee6d35 Wallet now uses AppUi 2018-09-11 12:37:53 -07:00
luiscuenca
fedea6e84d Comply with review comments 2018-09-11 12:23:25 -07:00
Wayne Chen
d69e536120 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-11 12:18:36 -07:00
Dante Ruiz
cc2c208b12 fix small issue 2018-09-11 12:12:31 -07:00
Dante Ruiz
735ff04fad fixing merge conflicts 2018-09-11 12:10:19 -07:00
Dante Ruiz
5c9a88868d first round of requested changes 2018-09-11 12:01:55 -07:00
Wayne Chen
800df1b077 Merge branch 'loginOnLaunch' of https://github.com/wayne-chen/hifi into loginOnLaunch 2018-09-11 11:02:16 -07:00
Wayne Chen
e931b661a5
login dialog pops up in HMD again 2018-09-11 11:00:39 -07:00
Wayne Chen
2a7e2af44f syntax reversion + removing poppedUp var 2018-09-11 10:36:10 -07:00
Wayne Chen
84cf40f8aa changing calculation of load percentage 2018-09-11 10:07:57 -07:00
Wayne Chen
aa62a89318 removing more logging for login dialog 2018-09-11 09:49:12 -07:00
Wayne Chen
9d7ba377ca removing logging for login dialog 2018-09-11 09:42:53 -07:00
Wayne Chen
ee516fd79f adding proper checking for saved username/login 2018-09-11 09:36:46 -07:00
Brad Hefta-Gaub
299e9d0d38
Merge pull request #13897 from ElderOrb/filter_out_hands_from_joints 
filter out left/right hands from joints list in avatarapp
 2018-09-11 09:34:48 -07:00
Brad Hefta-Gaub
ab1718747b
Merge pull request #13970 from jherico/fix/fb18149 
Ensure a web overlay doesn't access an invalid tabletScriptingInterface
 2018-09-11 09:31:33 -07:00
Wayne Chen
6bcf6eaae7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-11 09:13:41 -07:00
Wayne Chen
565bf7f6bd adding correct implementation of show password 2018-09-11 09:08:35 -07:00
Wayne Chen
030ee13f31 removing logging from tabletlogindialog 2018-09-10 23:05:31 -07:00
Wayne Chen
69ae475787 adding user activity logging 2018-09-10 23:04:50 -07:00
Wayne Chen
5ece8d8707 using different paradigm for checking login dialog popup 2018-09-10 18:32:21 -07:00
Wayne Chen
28c3afca9d adding back inlines 2018-09-10 17:40:35 -07:00
Wayne Chen
0290ea4bdc Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-10 17:40:16 -07:00
Wayne Chen
fa3097225b removing inlines - not allowed for unique_ptr 2018-09-10 17:33:32 -07:00
Wayne Chen
60a5b0eeaf
Merge pull request #1 from danteruiz/interstitalMerged 
handle unable to connect to domain case
 2018-09-10 17:23:50 -07:00
Wayne Chen
c194c236f1 adding inlines 2018-09-10 17:10:13 -07:00
Wayne Chen
a55849d24b
Merge branch 'interstitalMerged' into interstitalMerged 2018-09-10 17:08:45 -07:00
Wayne Chen
2381d6bc02
using REDIRECT_HIFI_ADDRESS 
recycling existing, defined variable for error redirection
 2018-09-10 17:07:49 -07:00
Wayne Chen
e5a87aa58c removing unused variables 2018-09-10 16:56:13 -07:00
Dante Ruiz
de5a0a714b handle unable to connect to domain case 2018-09-10 16:25:17 -07:00
Wayne Chen
dcacfdba7c adding popup property to qml 2018-09-10 16:22:55 -07:00
SamGondelman
0e079e78e6 correct transparent parabola shader 2018-09-10 16:20:50 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms 
Remove all uniforms from our shaders
 2018-09-10 15:42:01 -07:00
Brad Davis
ba1ac7c180 Ensure a web overlay doesn't access an invalid tabletScriptingInterface 2018-09-10 15:07:15 -07:00
Wayne Chen
e7616c7d34 added logging + activity logging 2018-09-10 15:06:14 -07:00
luiscuenca
6f4e9ded09 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-10 14:42:02 -07:00
sabrina-shanman
9a86b7451b Add collision group parameter to collision pick and set my avatar as the default 2018-09-10 14:35:04 -07:00
Anthony Thibault
4754ff7f54
Merge pull request #13963 from hyperlogic/feature/improve-jump-anims 
Improve animations for jump, inAir and less feminine walk cycle
 2018-09-10 13:57:33 -07:00
John Conklin II
9c546fc780
Merge pull request #13957 from ElderOrb/FB18024 
fix keyboard collapsing in VR/goto
 2018-09-10 13:09:28 -07:00
Wayne Chen
a8adaff6c1 Merge branch 'loginOnLaunch' of https://github.com/wayne-chen/hifi into loginOnLaunch 2018-09-10 11:36:53 -07:00
Wayne Chen
ff86e480ba adding debug statement to check for window close 2018-09-10 11:36:45 -07:00
Seth Alves
cb33222fea
Merge pull request #13886 from ctrlaltdavid/M17901 
Improve HMD Menu page navigation
 2018-09-10 11:34:21 -07:00
Anthony Thibault
d9beadb7e4 remove tabs from avatar-animation.json 2018-09-10 10:49:43 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling 2018-09-10 10:15:49 -07:00
Wayne Chen
e721844b10 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-10 10:10:16 -07:00
luiscuenca
a9f676354b Only invisible pointers and scale fix 2018-09-10 08:54:53 -07:00
Sam Gateau
983badf80a
Merge pull request #13663 from SamGondelman/lod 
Enable LOD manager on android
 2018-09-08 13:43:36 -07:00
David Rowe
7dba2e6a2e Merge branch 'master' into M17428-f 2018-09-08 12:45:11 +12:00
Anthony Thibault
ff645be78b Update animations for jump, inAir and less feminine walk cycle 2018-09-07 17:09:55 -07:00
Stephen Birarda
adac872a11 clear other avatars in agent on avatar mixer disconnect 2018-09-07 15:04:14 -07:00
Stephen Birarda
be57789ad8
Merge pull request #13931 from SimonWalton-HiFi/safe-landing-cleanup 
Remove some debug logging left in the safe landing module
 2018-09-07 14:58:00 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats 
Move animation stats into its own Menu
 2018-09-07 14:51:46 -07:00
luiscuenca
d09391faa5 Fix invisible error 2018-09-07 12:17:40 -07:00
Wayne Chen
695f6a8f16 Merging changes, modifying close button 2018-09-07 12:05:28 -07:00
luiscuenca
02065518cb Merge branch 'master' of https://github.com/highfidelity/hifi into stt_teleport_wip 2018-09-07 11:57:48 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale 
Scale Collision Pick to match parent
 2018-09-07 11:54:02 -07:00
John Conklin II
2ac0377a6e
Merge pull request #13952 from amantley/steppingReboot 
Fix for lurching walk(case 16945), when walking in hmd.
 2018-09-07 11:43:03 -07:00
Wayne Chen
39041f2942 fixing username field 2018-09-07 11:36:21 -07:00
Wayne Chen
44d36ec622 wallet should save username when checked 2018-09-07 11:31:36 -07:00
Wayne Chen
db96603cda removing some unused properties 2018-09-07 11:23:58 -07:00
Wayne Chen
d9495275cc adding cancel button and signed in checkbox 2018-09-07 11:22:31 -07:00
Sam Gondelman
57275422f2
Merge branch 'master' into lod 2018-09-07 10:01:26 -07:00
Simon Walton
741d4ba998
Merge branch 'master' into avatar-mixer-scaling 2018-09-07 09:30:39 -07:00
sabrina-shanman
8d4c47cf8e Make template specialization of BaseNestableTransformNode explicit 2018-09-07 08:49:44 -07:00
Wayne Chen
e1541fd7e0 Merge branch 'master' of https://github.com/wayne-chen/hifi into loginOnLaunch 2018-09-07 08:43:42 -07:00
Alexander Ivash
7058b07aea FB18024: 2 users report that while in VR and in GoTo menu, keyboard is unable to be minimized 2018-09-07 12:41:39 +03:00
Alexia Mandeville
190a335c71
Adding more margin to forgotten links 2018-09-07 00:01:00 -07:00
Alexia Mandeville
92f218ae29
Adding margins to forgotten link text 2018-09-06 22:59:19 -07:00
Alexia Mandeville
2443723a2b
Removing margins, adding width attribute 2018-09-06 21:14:04 -07:00
Anthony Thibault
6508533a15 Remove anim stats from plain ole stats. 
There are still present in anim stats tho.
 2018-09-06 17:58:40 -07:00
Wayne Chen
72818f3729 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged 2018-09-06 17:37:36 -07:00
Wayne Chen
ef3449f96d Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged 2018-09-06 17:36:47 -07:00
sabrina-shanman
7a9480723e Remove unused variable in PickScriptingInterface::createTransformNode 2018-09-06 17:30:29 -07:00
Wayne Chen
e76ebf7a0b changing location of shortcuts 2018-09-06 17:29:16 -07:00
Dante Ruiz
2f9119529a editing the interstitial page 2018-09-06 17:06:17 -07:00
SamGondelman
ed7f993c0d avatar mixer and manager perf improvements and cleanup 2018-09-06 16:57:20 -07:00
sabrina-shanman
23a6abbaca Update jsdocs to reflect new collision pick scaling behavior 2018-09-06 16:47:09 -07:00
sabrina-shanman
836f810c41 Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code 2018-09-06 16:33:29 -07:00
Anthony Thibault
acc7f1f168 Moved AnimStats into its own qml panels. 
Added state machine tracking as well.
 2018-09-06 16:18:58 -07:00
Alexia Mandeville
8e5f5cc796 Moving forgotten links 2018-09-06 16:16:43 -07:00
Zach Fox
0e785f9bdb Fix MS17877: Persist Connections table sort choice 2018-09-06 15:35:26 -07:00
John Conklin II
7bbedf65c7
Merge pull request #13950 from sethalves/overlay-set-name-crash 
fix a crash related to setting an overlay's name
 2018-09-06 14:28:11 -07:00
Alexia Mandeville
aabfda6eb5 Adding descriptive text 2018-09-06 14:16:42 -07:00
Alexia Mandeville
00e10ad684 Updating sign up text, moving forgotten info links 2018-09-06 14:05:51 -07:00
Gabriel Calero
2d2a4804f7 Add android settings screen. Add AEC setting 2018-09-06 17:49:52 -03:00
amantley
90a51e6181 added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area 2018-09-06 13:12:48 -07:00
John Conklin II
152ec3d631
Merge pull request #13945 from davidkelly/dk/17915 
volume slider on individual users in PAL remembers setting now
 2018-09-06 12:55:46 -07:00
sabrina-shanman
714cfc5ef1 Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc 2018-09-06 12:14:50 -07:00
sabrina-shanman
727b62144f Fix MyAvatarHeadTransformNode not using avatar scale 2018-09-06 12:03:13 -07:00