Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 11:52:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
74087 commits 76 branches 59 tags 1.2 GiB
Commit graph

5540 commits

Author SHA1 Message Date
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
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
Howard Stearns
d3391b9273 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-24 13:50:52 -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
Wayne Chen
3f9c8a266d reszing unameField/showing flavorText 2018-09-21 14:36:13 -07:00
Kerry Ivan Kurian
f9c25f2f32 Allow user to select asset type in marketplace item tester 2018-09-20 16:36:06 -07: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
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
5bc7d944f9 Remove whitespace 2018-09-19 15:17:13 -07:00
Alexander Ivash
08b07e57d0 FB12459 - Keyboard shouldn't lower when move between property values in Create app in HMD mode 2018-09-20 00:42:39 +03: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
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
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
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
Zach Fox
68e6142f8b Follow wallet setup referrer when autogenerating new wallet 2018-09-14 15:34:00 -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
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
Wayne Chen
bcd014ddc8 Merge branch 'master' of https://github.com/highfidelity/hifi into fixLoopingConnectionMonitor 2018-09-13 10:29:02 -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
Wayne Chen
be650d5af0 changing when to log - there is broken code in bodyLoader 2018-09-12 16:00:43 -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
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
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
Zach Fox
ea04ee6d35 Wallet now uses AppUi 2018-09-11 12:37:53 -07:00
Wayne Chen
d69e536120 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-11 12:18:36 -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
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
e7616c7d34 added logging + activity logging 2018-09-10 15:06:14 -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
Wayne Chen
e721844b10 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-10 10:10:16 -07:00
Anthony Thibault
ff645be78b Update animations for jump, inAir and less feminine walk cycle 2018-09-07 17:09:55 -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
Wayne Chen
695f6a8f16 Merging changes, modifying close button 2018-09-07 12:05:28 -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
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
Wayne Chen
e76ebf7a0b changing location of shortcuts 2018-09-06 17:29:16 -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
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
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
Wayne Chen
a5038850f1 right align forgot user/pw shortcuts 2018-09-06 11:37:35 -07:00
Wayne Chen
385027321b fixing the eye open/closed pw image 2018-09-06 11:18:35 -07:00
Ryan Huffman
80b5f90160
Merge pull request #13857 from thoys/fix/interactiveWindows/onlyOnTopWhileMainWindowActive 
MS17463: only show InteractiveWindow on top of interface window
 2018-09-06 10:15:20 -07:00
Dante Ruiz
200f6d540a Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-09-06 09:59:51 -07:00
Wayne Chen
3f1eba418d modifying location of links for user/pw 2018-09-06 00:07:23 -07:00
Wayne Chen
6d055ba136 changing sign up label 2018-09-05 23:49:49 -07:00
Wayne Chen
78fa52285f adding show password toggle in textfield 2018-09-05 23:48:21 -07:00
Wayne Chen
7a136812bf Merge branch 'login-update' of https://github.com/alexiamandeville/hifi into loginOnLaunch 2018-09-05 20:05:19 -07:00
David Rowe
ab47e16be1 Fix up titles and leading white space of some dev menu tablet dialogs 2018-09-06 14:35:08 +12:00
David Rowe
8420afd143 Fix title not not going back to "Settings" upon Save or Cancel 2018-09-06 14:00:33 +12:00
Anthony Thibault
3a3ffcc98c First pass at improving anim stats. 2018-09-05 18:14:06 -07:00
Alexia Mandeville
901de120a6 Removing flavortext 2018-09-05 17:20:49 -07:00
Alexia Mandeville
1e697ad45f Removing labels, adding flavor text, moving links 2018-09-05 16:25:18 -07:00
David Rowe
a7099025dc Fix up some Settings dialogs' titles 2018-09-06 11:15:14 +12:00
David Rowe
960bf00e12 Modify look of HMD mode Settings dialogs' titles 2018-09-06 11:02:24 +12:00
David Kelly
b022697dfa volume slider on users fixed 2018-09-05 15:36:07 -07:00
David Rowe
398724de73 Make Save in HMD settings dialogs return to previous dialog 
Same as Cancel key does.
 2018-09-06 10:23:45 +12:00
Alexia Mandeville
dcf2e00bd7 Adding placeholder text 2018-09-05 14:55:12 -07:00
Wayne Chen
841080ea72 Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-05 11:54:21 -07:00
Wayne Chen
77bb6fa4d5 adding position to try again zone; updating whitespace 2018-09-05 11:53:49 -07:00
Wayne Chen
c6229c5c60 updating serverless file to have dynamic oops 2018-09-05 10:37:45 -07:00
Wayne Chen
179138aa10 updating serverless file to have dynamic oops 2018-09-05 10:36:06 -07:00
Wayne Chen
ebedbabace Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-05 09:06:36 -07:00
Wayne Chen
f38a26a1ff updating location of oops dialog script 2018-09-05 09:04:17 -07:00
Thijs Wenker
62d4b1805d Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive 2018-09-05 17:25:14 +02:00
Wayne Chen
d6442b350c updating redirect to the interstitial page url 
TODO: Fix this link to s3 bucket hosted file
 2018-09-04 23:18:57 -07:00
Wayne Chen
62abb51b26 Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-04 23:18:06 -07:00
Wayne Chen
afd7321e7f updating redirect with proper fbx 
TODO: fix path when uploaded the fbx files
 2018-09-04 23:16:59 -07:00
Wayne Chen
8b6c21e0bb updating script path 
TODO: will fix with s3 hosted script
 2018-09-04 22:19:20 -07:00
Wayne Chen
7721cba483 Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-04 22:18:16 -07:00
Wayne Chen
af1c473a9c updating with models in meshes folder 2018-09-04 22:17:33 -07:00
Wayne Chen
c47788efe4 merging with dante's PR 2018-09-04 18:00:06 -07:00
Wayne Chen
9e0fa08cf1 adding property to location, updating domain 2018-09-04 17:46:23 -07:00
Wayne Chen
002c6547ee entity script URL update 2018-09-04 14:08:13 -07:00
Wayne Chen
22a8164401 adding back refusal notifications + domain bounds/floor 2018-09-04 13:53:03 -07:00
Wayne Chen
c95cb97b9b adding working version with networking signals 2018-08-31 19:29:48 -07:00
David Rowe
f144308334 Make tablet menu page title navigation go back a level 2018-08-31 16:58:59 +12:00
Wayne Chen
82c7495615 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-30 19:41:06 -07:00
David Rowe
ed441d5570 Merge branch 'master' into M17901 2018-08-31 14:30:11 +12:00
Alexander Ivash
07739453c5 coding standards 2018-08-31 01:51:13 +03:00
Alexander Ivash
cb1855b0d7 filter out left/right hands from joints list in avatarapp 
should fix:
	FB17884 - Wearable disappears when added to some joints
	FB17885 - Changing werable joint moves the model and detaches from avatar body
 2018-08-31 01:51:13 +03:00
Alexander Ivash
daf81bbcb8 FB17982 Avatar App reloads existing selected bookmark on app relaunch 2018-08-31 00:36:52 +03:00
Sam Gateau
9e2a540bab Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 12:12:24 -07:00
Sam Gateau
12ec56875e
Merge pull request #13867 from SamGondelman/recurse 
findRayIntersection/findParabolaIntersection performance improvements
 2018-08-30 09:49:16 -07:00
Dante Ruiz
8c77820e30 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-30 09:45:41 -07:00
Wayne Chen
eb29c9c4a2 updating with default landing location 2018-08-29 16:53:22 -07:00
Wayne Chen
3810984056 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-29 16:18:16 -07:00
Wayne Chen
6cdcae3349 switching address syntax, updating redirection domain 2018-08-29 16:11:51 -07:00
Sam Gateau
349f782697 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-29 16:07:50 -07:00
Zach Fox
67e57a9487
Merge pull request #13849 from zfox23/MS16003_backCloses 
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
 2018-08-29 14:29:12 -07:00
Alexia Mandeville
9f0807c9d5 Adjust saturation on diffuse 2018-08-29 13:41:24 -07:00
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00
Wayne Chen
8a9ad421e7 adding serverless file + redirection if conn fail 2018-08-28 15:50:14 -07:00
Thijs Wenker
c4d43b3fbc CR fixes 2018-08-28 19:43:59 +02:00
Alexia Mandeville
805e19e7bb Updating highlight textures 2018-08-27 17:15:28 -07:00
David Rowe
c29c9f98c1 Make Cancel in HMD settings dialogs return to Settings dialog 2018-08-28 11:15:57 +12:00
Thijs Wenker
c05fe7f0b7 Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive 2018-08-28 00:00:44 +02:00
Thijs Wenker
efa3fa7907 Don't always on top InteractiveWindows (Windows OS) 2018-08-27 20:42:06 +02:00
Dante Ruiz
af19849a75 fixing merge conflict 2018-08-24 15:48:42 -07:00
Sam Gateau
8f8bcc1901 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-24 15:23:37 -07:00
John Conklin II
477fba4b15
Merge pull request #13847 from AndrewMeadows/workload-avatars-002 
workload tracks other avatars and adds/removes from physics simulation accordingly
 2018-08-24 12:43:51 -07:00
SamGondelman
3d048c77ba Merge remote-tracking branch 'upstream/master' into recurse 2018-08-24 11:39:05 -07:00
Sam Gateau
699240027e Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-23 19:29:14 -07:00
SamGondelman
b5b7167644 add to stats 2018-08-23 17:56:24 -07:00
Andrew Meadows
10d0833c19 use DynamicsWorld::numCollisionObjects instead of our own count 2018-08-23 15:57:54 -07:00
Zach Fox
dddb2141f0 Implement Wallet Security feature - Auto Logout checkbox 2018-08-23 15:45:29 -07:00
Zach Fox
a1d88a8588 Merge howard/wallet-locker2 into my branch 2018-08-23 14:45:16 -07:00
Andrew Meadows
777b90bdc0 add 'physics body count' to debug stats 2018-08-23 12:59:28 -07:00
Sam Gateau
473f8d0ca5 Working on the LOD system 2018-08-23 11:39:47 -07:00
Dante Ruiz
f5441b2721 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-22 15:28:42 -07:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184 
Add Support for Managing Avatar Entities to the Avatar App
 2018-08-22 10:20:04 -07:00
Alexander Ivash
cfb820762d bulk adjusting to coding guidelines 2018-08-22 00:42:01 +03:00
Zach Fox
a378435683 Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back 2018-08-21 10:20:51 -07:00
Dante Ruiz
db3d3d3d93 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-21 09:56:59 -07:00
Alexander Ivash
9f92ff5de9 fix for duplicating wearables on saving 
note: the issue was caused by newly-introduced code converting between attachments & entities
fix removes attachments-related code because attachments are deprecated and converted into entities on the fly
 2018-08-18 16:38:35 +03:00
Alexander Ivash
3bcd6f4a25 take 'relayParentJoints' into account during wearables comparison 2018-08-18 16:33:30 +03:00
Alexander Ivash
877bce23d2 explicitely specify localRotations on joint change, otherwise it will be updated by engine 2018-08-18 16:32:31 +03:00
John Conklin II
0c0ecd18c9
Merge pull request #13827 from amantley/newJumpWalkMotions 
Replacing jump_takeoff.fbx and jump_land.fbx animations to fix transition to fly bug
 2018-08-16 13:26:37 -07:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable 
Use Create Entities as Grabbable option when adding asset to world
 2018-08-16 09:22:23 -07:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184 2018-08-16 02:08:47 +03:00
amantley
0a1a75f752 Merge remote-tracking branch 'upstream/master' into newJumpWalkMotions 2018-08-15 10:26:24 -07:00
amantley
48e08276bf added new jump_takeoff and jump_land to fix the tposing in the transition to and from flying 2018-08-15 10:20:17 -07:00
Seth Alves
83718ca06d
Merge pull request #13746 from alexiamandeville/emoteIcon 
updating emote app icon
 2018-08-15 08:29:48 -07:00
Kerry Ivan Kurian
6a34bde49c
Merge pull request #13825 from roxanneskelly/autoScroll 
Auto scroll
 2018-08-14 20:56:53 -07:00
Roxanne Skelly
50b0a458ce Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled. 2018-08-14 16:32:56 -07:00
Roxanne Skelly
5a8da4ce97 Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app 2018-08-14 15:28:22 -07:00
Roxanne Skelly
987d8569ae Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll 2018-08-14 15:27:22 -07:00
John Conklin II
a5bace4e4d
Merge pull request #13706 from ElderOrb/FB17062 
use updated 'Last Legends: Male' from Mukul
 2018-08-14 14:18:39 -07:00
Ryan Huffman
19f27ec911
Merge pull request #13810 from ctrlaltdavid/M11360 
Don't auto-action entry in HMD file dialog when single-click
 2018-08-14 12:57:28 -07:00
Seth Alves
832eefd3a2
Merge pull request #13752 from ctrlaltdavid/M17208 
Improve text in Avatar app's pop-ups
 2018-08-14 08:48:04 -07:00
unknown
c622a587e3 Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-11 07:59:56 -07:00
Dante Ruiz
75cc1c62c0 mostly done interstitial page 2018-08-10 16:53:34 -07:00
Zach Fox
57d2f04f14
Merge pull request #13799 from davidkelly/dk/17340 
Only update gain if it really changed
 2018-08-10 16:20:24 -07:00
Zach Fox
096be16bb1 Only restart timer if feedMouseArea doesn't contain mouse 2018-08-10 15:32:44 -07:00
Zach Fox
1a6a55680c PropagateComposedEvents 2018-08-10 15:30:32 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges 
New Default Strafe Animations Plus Animation Tuning Support
 2018-08-10 15:03:30 -07:00
Alexander Ivash
5ba68cbfac remove attachments menu item / dialogs / related components 2018-08-11 00:50:32 +03:00
David Rowe
3a356de49f Don't auto-action entry in HMD file dialog when single-click on it 2018-08-11 09:46:11 +12:00
Alexander Ivash
c1ebadfdd8 adjust text in 'get wearables' popup 2018-08-11 00:43:39 +03:00
Alexander Ivash
e6915e63f2 put 'Fedora' on HEAD 2018-08-11 00:39:43 +03:00
unknown
5d1cc3696a Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-10 12:10:57 -07:00
Zach Fox
f514fde6fd
Merge pull request #13789 from zfox23/MS17469_listModelFix 
v0.72.0: Fix MS17469: Fix conditionals for needing more paginated results when ListView changes
 2018-08-10 10:24:01 -07:00
Alexander Ivash
9b9e30e829 add 'Tip: You can use hand controllers to grab and adjust your wearables' if in HMD 2018-08-10 20:14:15 +03:00
David Kelly
2b5ecd6b5f remove extraneous log 2018-08-10 10:12:32 -07:00
Zach Fox
e39dd250cd Things will 'just work' once backend is in place 2018-08-10 10:01:09 -07:00
amantley
74186b0162 changed back speed to 2.2 m/s and the end frame for strafe left and right to 33, and the end frame for wlk_bkwd to 27 2018-08-10 09:56:24 -07:00
unknown
5641c59f5f Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable 2018-08-10 09:49:37 -07:00
Zach Fox
9124e5cf22 Merge branch 'master' of github.com:highfidelity/hifi into autoScrollGoTo 2018-08-10 09:47:10 -07:00
Zach Fox
1699d3ed6a Wording change in Availability 2018-08-10 09:35:40 -07:00
Alexander Ivash
3bfe173371 allow saving wearables right after adding new one 2018-08-10 19:15:35 +03:00
Alexander Ivash
9304d6c5c4 reset UI to default state & disable controls on removing last wearable 2018-08-10 18:42:08 +03:00
Alexander Ivash
90fb0d7be6 add possibility to add wearable from external url 2018-08-10 17:59:11 +03:00
Alexander Ivash
9234813e08 bring back 'get more' wearables button 2018-08-10 14:54:15 +03:00
Alexander Ivash
1771e4c742 better handling of 'modified' inside AdjustWearables dialog 2018-08-10 12:58:45 +03:00
Alexander Ivash
e900e034a3 couple Spinbox fixes: 
- stop resetting value in 'valueFromText'. The issue with such approach is that is is not possible to understand whether value was really changed or, for example, focus did change
- instead, propagate validator to TextInput which makes not possible to type bad text (which eliminate the reason for original fix)
- specify correct inputMethodHints to guide onscreen keyboards
 2018-08-10 12:58:45 +03:00
Alexander Ivash
56194bba8e bind 'is soft' to backend API, always show 'Hips' for soften entity 2018-08-10 12:58:45 +03:00
Alexander Ivash
da68a8906e show displayText if specified (to allow override combobox current value) 2018-08-10 12:58:45 +03:00
Alexander Ivash
550e39ac84 add possibility to change joints using combobox 2018-08-10 12:58:45 +03:00
Alexander Ivash
f8c1ba48ad update UI accordingly to the updated mockup 2018-08-10 12:58:44 +03:00
Alexander Ivash
a85ed2a2f5 show 'edit wearables' button even if avatar doesn't have any wearables 2018-08-10 12:58:44 +03:00
amantley
c8a31bc59f created a backward walk speed constant 1.6m/s and changed the characteristic speed for strafe right left to 1.3 2018-08-09 17:38:57 -07:00
Dante Ruiz
353121be7d making some changes 2018-08-09 16:29:37 -07:00
Alexia Mandeville
38973f0840 Adding icon states to emote app, active state 2018-08-09 16:00:36 -07:00
David Kelly
3b7d1cb6cf Only update gain if it really changed 
and only fire UserActivity if we really do change the gain
 2018-08-09 14:55:07 -07:00
Zach Fox
c0e2b3a240 Happening Now -> Featured 2018-08-09 11:49:29 -07:00
Zach Fox
4248f342b4 Fix MS17469: Fix conditionals for needing more paginated results when ListView changes 2018-08-09 10:22:09 -07:00
David Back
8db0711b5b set grabbable user data in addModelEntity, pass grabbable from asset browser 2018-08-08 16:33:47 -07:00
Zach Fox
af9dc8acca Turn on only for Annoucements 2018-08-07 11:51:38 -07:00
Zach Fox
4cee6b720a Implement auto-scrolling on Places cards (TODO for Connections) 2018-08-07 11:50:38 -07:00
Dante Ruiz
8c5eefcc95 some file and code cleanup 2018-08-07 10:58:45 -07:00
amantley
1ad6b041cd updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed 2018-08-06 18:36:32 -07:00
amantley
f1990378fd merged the json from the ik 2 bone pr into the new animation json 2018-08-06 14:27:09 -07:00
amantley
08889b627a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-08-06 09:16:53 -07:00
John Conklin II
00a8b73814
Merge pull request #13751 from danteruiz/fix-flying 
fix flying
 2018-08-03 19:27:47 -07:00
Dante Ruiz
9bebd1e623 making changes 2018-08-03 18:11:55 -07:00
amantley
375d726535 added the new animations for strafe and walk to the resource file and updated the avatar-animation.json file 2018-08-03 16:48:43 -07:00
David Rowe
f9d9324a14 Improve text in Avatar app's pop-ups 2018-08-04 10:55:57 +12:00
Sam Gateau
c1951da2bb
Merge pull request #13737 from jherico/fix/fb16633_a 
Don't allow Web surfaces created by non-client scripts to access files
 2018-08-03 15:25:41 -07:00
Alexia Mandeville
b3426f695b Making icon bigger 2018-08-03 15:12:18 -07:00
Alexia Mandeville
c58322387a Increase stroke width on icon 2018-08-03 13:05:20 -07:00
Alexia Mandeville
eda80fb36f updating emote app icon 2018-08-02 13:26:08 -07:00
amantley
bd88d5f15b merging with ik leg fix code in master 2018-08-02 09:48:04 -07:00
Zach Fox
67528cb646 Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present 2018-08-01 15:49:53 -07:00
Brad Davis
4b317a84d8 Don't allow Web surfaces created by non-client scripts to access files 2018-08-01 15:12:45 -07:00
Zach Fox
7905c91289
Merge pull request #13727 from zfox23/MS17168_filterWhenViewing 
Fix MS17168: Filter My Purchases when clicking View link on Confirmation
 2018-08-01 14:23:26 -07:00
John Conklin II
c444bb11ba
Merge pull request #13668 from ElderOrb/base_bluebuttons_on_uit 
Avatarapp: base 'SquareLabel' on button from Uit
 2018-08-01 13:10:33 -07:00
John Conklin II
082a3bca89
Merge pull request #13679 from ElderOrb/FB16840 
FB16840 - Qml spinboxes in UI toolkit should focus the underlying fie…
 2018-08-01 11:46:59 -07:00
John Conklin II
bda9ed7f1a
Merge pull request #13680 from ElderOrb/adjust_wearables_button_fix 
use 'light' color scheme
 2018-08-01 11:23:10 -07:00
John Conklin II
c67ef57ad3
Merge pull request #13713 from hyperlogic/bug-fix/leg-ik-bug-fixes-master 
Leg IK fixes
 2018-08-01 11:17:10 -07:00
Zach Fox
4b41804326 Fix MS17168: Filter My Purchases when clicking View link on Confirmation 2018-07-31 14:52:01 -07:00
Alexander Ivash
6e6eae2160 Avatarapp: base 'SquareLabel' on button from Uit 2018-07-31 22:03:34 +03:00
John Conklin II
09d1964f1d
Merge pull request #13670 from ElderOrb/animate_get_more_avatars 
Avatarapp: hover animation for 'get more avatars' button
 2018-07-31 09:51:58 -07:00
John Conklin II
221dd3ee88
Merge pull request #13673 from ElderOrb/avatarapp-update-messageboxes 
FB16992 - Layout changes to the two lightboxes in the Avatar app
 2018-07-31 09:36:16 -07:00
John Conklin II
bd2ab38bfe
Merge pull request #13701 from ElderOrb/FB16702 
FB16702 - Avatar App does not save Animation JSON Override URL
 2018-07-30 14:51:32 -07:00
John Conklin II
200292c18e
Merge pull request #13675 from howard-stearns/forget-you 
pal refresh fixes
 2018-07-30 14:38:24 -07:00
Anthony J. Thibault
401995fb06 Leg IK fixes 
Fixes for raising legs and sometimes squatting while in HMD mode.
 2018-07-30 10:55:52 -07:00
amantley
637a214165 added the anim stack print out static object for the list of motion and weights 2018-07-27 17:25:00 -07:00
John Conklin II
9c37e30fe6
Merge pull request #13678 from ElderOrb/FB17023 
FB17023 - Make visible avatar url in the avatar app
 2018-07-27 14:57:25 -07:00
amantley
b28ce40f09 adding the anim stack print out feature half way done 2018-07-27 08:46:40 -07:00
Alexander Ivash
d38f0b0fde use updated 'Last Legends: Male' from Mukul 2018-07-27 12:32:18 +03:00
Alexander Ivash
29f7cab7df FB16702 - Avatar App does not save Animation JSON Override URL 
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
 2018-07-27 02:08:44 +03:00
howard-stearns
9b61e8c4ad Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-26 11:50:15 -07:00
amantley
b91df1b2d4 cleaned up stray files and old hud code 2018-07-24 17:25:27 -07:00
amantley
91b9865f27 Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-07-24 17:14:24 -07:00
Zach Fox
eea4630d2b Fix MS16704: Remove worn Avatar/Wearable before updating 2018-07-24 14:29:05 -07:00
Alexander Ivash
c9d9f7363a use 'light' color scheme 2018-07-24 23:19:11 +03:00
Alexander Ivash
dfb20c4afc FB16840 - Qml spinboxes in UI toolkit should focus the underlying field when clicked on 2018-07-24 23:02:06 +03:00
Alexander Ivash
c13f27e2eb FB17023 - Make visible avatar url in the avatar app 2018-07-24 22:10:18 +03:00
amantley
aa92865b21 added the code to display the alphas for the motion blends 2018-07-23 17:45:24 -07:00
howard-stearns
48184c102b Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-23 15:25:46 -07:00
howard-stearns
f87db26cad pal refresh that remembers your place 2018-07-23 15:25:06 -07:00
John Conklin II
27b35d84cc
Merge pull request #13652 from r3tk0n/16206-flying-settings 
MS16206 - Enable flight by default in desktop, controls menu changes re: flying
 2018-07-23 15:19:46 -07:00
Alexander Ivash
fd7fb424f5 apply updated image from Mukul 2018-07-23 23:48:06 +03:00
Alexander Ivash
e12569c747 FB16992 - Layout changes to the two lightboxes in the Avatar app 2018-07-23 23:24:17 +03:00
Alexander Ivash
091de4a9b5 Avatarapp: hover animate 'get more avatars' 2018-07-23 22:33:47 +03:00
amantley
962f3c6c53 added a placeholder for the animation stack stats that will be added 2018-07-20 14:16:20 -07:00
MuteTab
97e5d65592 Added conditional check for VR vs non-VR menu. 2018-07-19 14:30:06 -07:00
Qliemillar
566c837bba
Merge pull request #13631 from ElderOrb/avatarapp-combobox-fix 
fix 'the drop down does not shows the wearable'
 2018-07-19 12:23:48 -06:00
Wayne Chen
37131d75e9
Merge pull request #13629 from wayne-chen/loginDialogBrowser-case-16537 
MS16537: Updating "Forgot Username/Forgot Password" behavior
 2018-07-18 16:32:55 -07:00
howard-stearns
0a47672d64 machinery for fetching next page of inifinite scroll before it really 
needed, and use in our infinite scrolls
 2018-07-18 13:00:03 -07:00
Alexander Ivash
fe96ad2389 fix 'the drop down does not shows the wearable' 2018-07-18 21:16:47 +03:00
Wayne Chen
0cbcae9181 reverting onLinkActivated brackets 2018-07-18 10:44:37 -07:00
Zach Fox
919bfce7ab Simplify 2018-07-18 09:00:01 -07:00
Wayne Chen
3b7f88a4a8 Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537 2018-07-17 17:08:43 -07:00
Zach Fox
ef4265de4b Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button 2018-07-17 16:16:43 -07:00
Zach Fox
7cdb84ee68
Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup 
Fix MS16562: Massive PAL speedup!
 2018-07-16 16:45:01 -07:00
Zach Fox
4daa0c6537 CR feedback 2018-07-13 12:47:45 -07:00
John Conklin II
33fb759c0a
Merge pull request #13599 from danteruiz/fix-combobox 
fixing combo boxes
 2018-07-13 10:33:33 -07:00
Zach Fox
2da911ad84 Merge branch 'master' of github.com:highfidelity/hifi into MS16562_massivePalSpeedup 2018-07-13 09:47:49 -07:00
Zach Fox
04f856019d Fix MS16701: Uninstall installed app before updating 2018-07-12 16:27:19 -07:00
Zach Fox
92756d81ad Implement MS16562: Massive PAL speedup! 2018-07-12 15:05:31 -07:00
Wayne Chen
089831b6ee Adding potential fix 2018-07-12 14:15:16 -07:00
Dante Ruiz
1c64ebc3ca fixing combo boxes 2018-07-12 13:57:48 -07:00
Sam Gondelman
2597568a0a
Merge pull request #13591 from Cristo86/android_revert_pr12888_qmls 
Rollback PR 12888 by deleting alternative +android files
 2018-07-12 12:06:35 -07:00
Zach Fox
f57fe892c3
Merge pull request #13590 from zfox23/MS16615_openFromPurchases 
Fix MS16615: Don't early-remove .app.json we JUST installed
 2018-07-12 11:51:52 -07:00
Cristian Luis Duarte
b1d39e4959 Rollback PR 12888 by deleting alternative +android files 2018-07-11 21:21:12 -03:00
Zach Fox
bf4954d667 Fix MS16615: Don't early-remove .app.json we JUST installed 2018-07-11 15:27:43 -07:00
Wayne Chen
cea2b94d2b removing debug print statements 2018-07-11 11:58:17 -07:00
Wayne Chen
179ba6506e Adding check for WindowsMR to the showHelp menu 2018-07-11 11:56:14 -07:00
Wayne Chen
f7e906440f Merge branch 'master' of https://github.com/highfidelity/hifi into updateControlsReference-case-9539 2018-07-11 11:20:10 -07:00
Sam Gateau
54d2f42fa4
Merge pull request #13544 from Zvork/haze 
Fix haze on Mac (bug #15515)
 2018-07-11 20:04:22 +02:00
Wayne Chen
81aac274ed Updating controls reference page 2018-07-10 17:34:03 -07:00
howard-stearns
8b713a437f don't store undefined in a qml int. 2018-07-10 12:14:31 -07:00
howard-stearns
886df959d1 expose totalPages and totalEntries, and use the later to display 
connections count
 2018-07-10 11:26:23 -07:00
Anthony Thibault
1d33f51ca4
Merge pull request #13528 from amantley/integratedStepping 
Step Detection From Head and Hands Tracking
 2018-07-10 09:59:22 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -07:00
John Conklin II
25406fa464
Merge pull request #13495 from thoys/feat/create/native-windows 
Create App: Native windows
 2018-07-09 14:25:13 -07:00