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

4075 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Wayne Chen
e721844b10 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-10 10:10:16 -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
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
Thijs Wenker
62d4b1805d Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive 2018-09-05 17:25:14 +02:00
David Rowe
f144308334 Make tablet menu page title navigation go back a level 2018-08-31 16:58:59 +12:00