Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-09 01:39:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74462 commits 69 branches 58 tags 1.2 GiB
Commit graph

4332 commits

Author SHA1 Message Date
Wayne Chen
eb36abbff6 more wip 2018-10-23 23:10:16 -07:00
Wayne Chen
3522fe5263 some work to profile screen 2018-10-23 22:19:54 -07:00
unknown
06aff231a3 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 20:19:06 -07:00
Wayne Chen
c28f0fd232 updating qml, adding new glyphs font 2018-10-23 16:22:42 -07:00
Howard Stearns
7707d92a95 connect wiring on purchases 2018-10-23 16:07:35 -07:00
Zach Fox
d1556ae4e8 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 15:51:34 -07:00
John Conklin II
e21e7d30d7
Merge pull request #14126 from amantley/squattyPottyFix 
Sit State for the seated user in HMD:  Squatty Potty Fix
 2018-10-23 15:20:49 -07:00
Kerry Ivan Kurian
e7d1c2873a Merge branch 'master' into log-resource-requests-2 2018-10-23 13:46:59 -07:00
David Back
9df8ea35bb Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 13:28:35 -07:00
Zach Fox
897d21bea2 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 13:18:08 -07:00
Howard Stearns
95b86bf5b7 initial limited commerce for oculus store prototype 2018-10-23 13:08:39 -07:00
Wayne Chen
d5b7fe62db modularizing qml font in login 2018-10-23 11:00:42 -07:00
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -07:00
Wayne Chen
56656a9079 adding button font modularity/using cairo 2018-10-23 10:46:19 -07:00
Wayne Chen
2a0a099397 adding steam svg 2018-10-23 10:04:21 -07:00
Wayne Chen
162502923a image for steam login button 2018-10-23 10:00:35 -07:00
Zach Fox
22c3321400 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 09:52:37 -07:00
Wayne Chen
c087b0f196 Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-10-23 08:51:45 -07:00
amantley
3e8663f8e9 removed the dropdown from the avatar app, because it is in settings controls now 2018-10-22 22:31:26 -07:00
Wayne Chen
137b240a47 more changes to functions 2018-10-22 20:03:12 -07:00
Wayne Chen
84001ae208 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-22 17:59:33 -07:00
Wayne Chen
1e418e9976 some cleanup in LinkAccountBody 2018-10-22 17:52:03 -07:00
amantley
472ab1c613 Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix 2018-10-22 17:50:56 -07:00
amantley
cce2f295a1 fixed conflict in myskeletonmodel.cpp 2018-10-22 17:49:30 -07:00
Wayne Chen
736a78061d button style change/cant access text 2018-10-22 17:44:03 -07:00
Wayne Chen
b33267a63a more wip 2018-10-22 17:38:12 -07:00
Zach Fox
1d8994993c Whitelist TTS scripting interface to TTS app, which is now a default script 2018-10-22 17:05:31 -07:00
David Back
e8bda1793f Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-22 15:12:45 -07:00
Zach Fox
f9cc4f5a69 Count unique source and url pairs 2018-10-22 14:00:01 -07:00
Zach Fox
de93bbb08b Only show unique resources 2018-10-22 13:59:59 -07:00
Zach Fox
d44f9e2ccc Tons of improvements 2018-10-22 13:59:57 -07:00
Zach Fox
55c1a88404 Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2 2018-10-22 13:59:50 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
John Conklin II
e40a021339
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles 
Better imports for controls and styles
 2018-10-22 11:50:09 -07:00
amantley
dfdc6aee7e
Merge branch 'master' into squattyPottyFix 2018-10-20 13:39:55 -07:00
Ryan Huffman
9d13902cd3 Improve paramater names in model dialog window 2018-10-20 11:26:12 -07:00
amantley
a427ddb235 removed extraneous print statements 2018-10-20 09:16:05 -07:00
amantley
55daeb11cd moved the radio buttons on the avatar settings to even them out better. will be corrected I'm sure 2018-10-19 18:43:02 -07:00
amantley
070a517423 changed the recenterModel variables to userRecenterModel 2018-10-19 18:07:03 -07:00
Ryan Huffman
f1258e4445 Add a 'grabbable' option to the new-model dialog 2018-10-19 16:42:45 -07:00
Wayne Chen
3bd10716b2 wip 2018-10-19 16:06:28 -07:00
amantley
a43985ef64 combo box for recenter model is added 2018-10-19 16:03:53 -07:00
Alexander Ivash
5fef331995 address CR comment 2018-10-19 19:35:12 +03:00
Wayne Chen
e32460ed96 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-19 09:25:57 -07:00
Alexander Ivash
5d8a253785 FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null 
note: change also resolve a lot of other shutdown errors from QML (related to null parent)
 2018-10-19 18:57:07 +03:00
amantley
0837f790eb combo box changes 2018-10-19 07:46:16 -07:00
John Conklin II
3210a4ec39
Merge pull request #14109 from zfox23/purchasesNoSnap 
Fix MS18154: Don't snap to cards in My Purchases
 2018-10-18 18:24:23 -07:00
John Conklin II
86cc612d73
Merge pull request #14185 from howard-stearns/keyboard-vs-submit 
make room for keyboard and help in SendAsset
 2018-10-18 17:53:52 -07:00
amantley
b9a2f19d30 made all the suggested corrections except the dropdown qml. 2018-10-18 16:39:50 -07:00
Kerry Ivan Kurian
d7d49ed84e Remove cruft 2018-10-18 16:25:26 -07:00
Kerry Ivan Kurian
4d7bc3094a Fix regression 2018-10-18 16:14:53 -07:00
Zach Fox
9f91238945 UX/UI improvements 2018-10-18 15:27:16 -07:00
Alexander Ivash
a4987e494a update imports 2018-10-18 21:05:20 +03:00
Alexander Ivash
740123b853 rename stylues-uit => stylesUit & controls-uit => controlsUit 
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
 2018-10-18 21:05:20 +03:00
Kerry Ivan Kurian
89a5da80e0 Do not display incomplete metadata 2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester 
Includes refactoring marketplace item tester into a single-page app.
 2018-10-18 01:04:47 -07:00
Alexander Ivash
0ab8a0ba5f FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: TypeError: Cannot read property of null 2018-10-18 01:23:10 +03:00
David Back
50becb5c37 merge particle explorer into properties, resurrect sliders, other tidying/fixes 2018-10-16 12:39:34 -07:00
amantley
67afc86222 cleanup 2018-10-11 18:39:44 -07:00
Howard Stearns
6c6d29152f new images for My Purchases rez tutorial 2018-10-11 12:36:43 -07:00
Howard Stearns
30971cd766 make room for keyboard and help in SendAsset 2018-10-10 15:43:20 -07:00
Wayne Chen
35eb857ea6 adding non-working login screen 2018-10-09 16:30:47 -07:00
Wayne Chen
3488763d94 reverting login dialog stuff 2018-10-09 16:29:56 -07:00
Alexander Ivash
6e66f289fe take 'materialData?materialName' cases into account 2018-10-09 23:08:14 +03:00
Anthony Thibault
7777f3edd0 Added OutOfRangeDataStrategy parameter to Controller Settings 
The openvr SDK provides a way to gauge the quality of tracking on a given device via the eTrackingResult enum.

* Drop - Only Running_OK is considered valid, all other eTrackingResults will return invalid poses.
* Freeze - Only Running_OK is considered valid, but other valid TrackingResults will return the last Running_OK pose.
  In esseces this will freeze the puck in place at the last good value.
* None - All valid eTrackingResults will be valid, including OutOfRange and Calibrating results.  This is the default.
 2018-10-09 10:51:02 -07:00
amantley
c4187f0d60 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-08 17:07:55 -07:00
Alexander Ivash
7d470cf161 FB18859 - Avatar App Bug when material entity is added as avatar entity 2018-10-09 01:59:41 +03:00
Wayne Chen
83d683de7a Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-08 08:52:38 -07:00
John Conklin II
afe6d97b00
Merge pull request #14100 from danteruiz/soft-entities-updates 
update soft entities and fix deadlock from qml.
 2018-10-04 13:33:34 -07:00
Dante Ruiz
613a6ab8cd removing unneeded code 2018-10-04 12:18:18 -07:00
Dante Ruiz
676293c880 trying another fix 2018-10-03 16:19:47 -07:00
Dante Ruiz
5734c24af4 another PR fix 2018-10-03 13:52:40 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586 
Teleport with play area
 2018-10-03 11:02:33 -07:00
John Conklin II
05609384b7
Merge pull request #14111 from zfox23/newConnectionsQuery 
Fix MS18608: Use new connections api endpoint
 2018-10-03 09:04:58 -07:00
Brad Davis
ffbb144a7c Fix avatar thumbnails 2018-10-02 16:31:24 -07:00
Dante Ruiz
182c92b951 fix mac issue 2018-10-02 11:24:09 -07:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00
Wayne Chen
e254324dbd Merging more files 2018-10-01 16:47:10 -07:00
Wayne Chen
72851acd8b adding spacer/close button pos 2018-10-01 16:44:01 -07:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2 
Account-managed wallet flow improvements
 2018-10-01 16:43:01 -07:00
John Conklin II
87b39f690c
Merge pull request #14106 from jherico/fix/mac_gl1 
Fix some Mac rendering issues
 2018-10-01 16:35:57 -07:00
Brad Hefta-Gaub
8b03a21799
Merge pull request #14025 from ElderOrb/FB18061 
use current wearable index, not joint index!
 2018-10-01 16:14:33 -07:00
David Rowe
6ccd73ea47 Merge branch 'master' into M18586 2018-10-02 10:17:24 +13:00
Wayne Chen
189e7e15fe
Merge branch 'master' into fixMainTextContainerQML 2018-10-01 09:48:42 -07:00
Dante Ruiz
ad92b172cb removing comment 2018-10-01 09:47:07 -07:00
Dante Ruiz
31baa46ee0 merging from master 2018-10-01 09:44:54 -07:00
amantley
1a0e2c6ea1 clean up for pr 2018-10-01 08:30:51 -07:00
amantley
bdd6befef9 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-09-29 15:39:36 -07:00
Zach Fox
59eabbbb5d Fix MS18608: Use new connections api endpoint 2018-09-28 14:28:50 -07:00
Zach Fox
5b72e17981 Fix MS18154: Don't snap to cards in My Purchases 2018-09-28 11:33:22 -07:00
Kerry Ivan Kurian
440e2062f5 Fix application uninstall in marketplace item tester 2018-09-27 22:14:02 -07:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
David Rowe
868a3a9219 Tweak vertical spacing 2018-09-28 15:42:48 +12:00
Bradley Austin Davis
3dea4fd10a Fix some Mac rendering issues 2018-09-27 19:21:50 -07:00
David Rowe
4813f4d042 Show/hide jumping & flying checkbox depending on movement mode 2018-09-28 13:02:27 +12:00
amantley
52355e53f1 adding the menu item to the avatar app for the sit state. 2018-09-27 16:44:55 -07:00
Howard Stearns
75de305ec3 remove dead code 2018-09-27 16:37:07 -07:00
Howard Stearns
7616639a40 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-27 16:12:21 -07:00
Dante Ruiz
c1c853790b update soft entities and fix deadlock 2018-09-27 14:53:28 -07:00
David Rowe
5ab22a1f40 Change play area option text for Oculus 2018-09-27 17:07:42 +12:00
Howard Stearns
da5f77afcd Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-26 15:26:52 -07:00
Zach Fox
6a3fa28fad Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-26 15:12:04 -07:00
Howard Stearns
e1659ed520 fix old bad merge, and if told referrer while already setup, follow 
immediately
 2018-09-26 14:57:47 -07:00
David Rowe
b98bd741b8 Indent and reword jumping and flying checkbox 2018-09-26 18:14:02 +12: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
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
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
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
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
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
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00
Thijs Wenker
c4d43b3fbc CR fixes 2018-08-28 19:43:59 +02: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
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
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
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
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
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
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
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