Commit graph

4136 commits

Author SHA1 Message Date
Wayne Chen
c43e67e4a8 adding tabbing between textfields 2018-10-31 16:57:03 -07:00
Wayne Chen
6822287d67 sending to tutorial if dismiss login 2018-10-31 16:13:01 -07:00
Wayne Chen
f62c8ae87a overlay HMD implementation 2018-10-31 15:26:49 -07:00
Wayne Chen
03c39eb92f more wip 2018-10-31 07:45:55 -07:00
Wayne Chen
43b269b612 testing tablet implementation 2018-10-30 11:48:22 -07:00
Wayne Chen
af04630642 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-26 17:53:13 -07:00
Wayne Chen
955b0a580e adding hooks for application for pause/resume 2018-10-25 17:25:44 -07:00
Wayne Chen
5e73fe3e41 more wip 2018-10-25 14:11:55 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
Quality Improvements to Avatars driven by Vive Trackers
2018-10-25 08:51:59 -07:00
Wayne Chen
75efc465b4 adding logging in qml wip 2018-10-24 17:34:42 -07:00
Wayne Chen
030b5a2745 resetting bodyLoader first source 2018-10-24 17:31:20 -07:00
Wayne Chen
951c4b2961 updating tablet implementation 2018-10-24 17:26:18 -07:00
David Back
b3e0d51260 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-24 11:48:56 -07:00
Wayne Chen
fad147656b tablet implementationWIP 2018-10-24 10:47:32 -07:00
Wayne Chen
331b09c8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-10-24 09:16:24 -07:00
Gabriel Calero
28c062b842 Don't show stats in release builds 2018-10-24 11:57:59 -03:00
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
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
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
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
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