Commit graph

74678 commits

Author SHA1 Message Date
Wayne Chen
8e916ea41b linking oculus acct creation to spinner 2019-01-16 17:05:59 -08:00
Wayne Chen
f4d4220e58 adding final create failure message handling, ui improvements 2019-01-16 17:05:56 -08:00
Wayne Chen
c54bce3953 fixing desktop login page crash 2019-01-16 17:05:55 -08:00
Wayne Chen
d38a657c54 filling username with oculus username, checking create error 2019-01-16 17:05:54 -08:00
Wayne Chen
671f15b63c removing isLogIn 2019-01-16 17:05:53 -08:00
Wayne Chen
3b3b86888e adding blur to login bg 2019-01-16 17:05:53 -08:00
Wayne Chen
fbc2dc5103 adding changes to forms 2019-01-16 17:05:52 -08:00
Wayne Chen
5c54930910 adding tablet close upon login 2019-01-16 17:05:52 -08:00
Wayne Chen
2d16e71e74 adding sending oculus ID including username 2019-01-16 17:05:52 -08:00
Wayne Chen
7e674ba3c4 better check for if oculus is running 2019-01-16 17:05:51 -08:00
Wayne Chen
ca0916886a adding more qml for oculus login 2019-01-16 17:05:51 -08:00
Wayne Chen
39a68a88f0 fixing typos in callback implementation 2019-01-16 17:05:51 -08:00
Wayne Chen
ed39b43d3b changing request to have a callback function passed 2019-01-16 17:05:51 -08:00
Wayne Chen
6bc1164d58 more wip on oculus login 2019-01-16 17:05:50 -08:00
Wayne Chen
4320f4cbe4 migrating platform plugin 2019-01-16 17:05:50 -08:00
Wayne Chen
a905310a58 more staging 2019-01-16 17:05:49 -08:00
Wayne Chen
704f005604 changing user id variable type 2019-01-16 17:05:49 -08:00
Wayne Chen
a24ebe2718 oculus functions live in the display plugin; display plugins update 2019-01-16 17:05:49 -08:00
Wayne Chen
970798705c improving flow from Oculus API to login dialog wip 2019-01-16 17:05:48 -08:00
Wayne Chen
1af57bdba6 staging 2019-01-16 17:05:48 -08:00
Wayne Chen
ebb9cd7de6 adding new plugin 2019-01-16 17:05:48 -08:00
Wayne Chen
db06533018 adding more staging 2019-01-16 17:05:48 -08:00
Wayne Chen
c22ad2b15a staging some oculus helper code 2019-01-16 17:05:47 -08:00
Wayne Chen
1fc51445d0 adding files for staging login 2019-01-16 17:05:47 -08:00
Antonina Savinova
1977180ecf
Merge pull request #14604 from zfox23/MS20089_interruptRecording
Implement MS20089: ACs playing avatar recordings now correctly handle playAvatarSound
2018-12-18 15:14:53 -08:00
Zach Fox
f31d685323
Fix spacing 2018-12-18 14:33:41 -08:00
Antonina Savinova
cceacd3d1d
Merge pull request #14593 from SimonWalton-HiFi/remove-backups-on-startup
Remove out-of-date backups on startup
2018-12-18 14:16:01 -08:00
Jeff Clinton
889f110357
Merge pull request #13925 from sethalves/fix-polyvox-texture-and-single-setter
fix a bug that broke Entities.setVoxel().  Fix polyvox textures
2018-12-18 12:15:07 -08:00
Jeff Clinton
2ff4905ed3
Merge pull request #14599 from wayne-chen/keepMeLoggedInDefault-78
MS20352: Keep me logged in checkbox as on by default
2018-12-18 11:57:17 -08:00
Wayne Chen
b5c3d7c3ed
Merge pull request #14596 from wayne-chen/loginForSmallAvatars-master
MS20332: HMD Login Prompt-- small avatars cannot reach easily
2018-12-18 10:49:26 -08:00
Zach Fox
fce4c252e7 Merge branch 'master' of github.com:highfidelity/hifi into MS20089_interruptRecording 2018-12-18 10:31:32 -08:00
Zach Fox
2964a05bd3 Keep playing the recording visually 2018-12-18 10:30:20 -08:00
Wayne Chen
50902080ce fixing typos 2018-12-17 16:48:02 -08:00
Wayne Chen
816733b55f reverting to master 2018-12-17 16:47:11 -08:00
Zach Fox
240917e8ae Fix MS20089: Enable interrupting of avatar recordings with sounds 2018-12-17 15:46:08 -08:00
Wayne Chen
302e314787 keep me logged in by default 2018-12-17 15:21:41 -08:00
Adam Smith
14ab53571f
Merge pull request #14564 from sabrina-shanman/hfm_prep
(case 20274) Create the HFM Preparation Step
2018-12-17 15:17:19 -08:00
Wayne Chen
09ff67eab3 Merge branch 'master' of https://github.com/highfidelity/hifi into loginForSmallAvatars-master 2018-12-17 14:03:16 -08:00
Wayne Chen
5d89ed2a81 matching master 2018-12-17 13:46:55 -08:00
Wayne Chen
28fd1380df adding target scale and default avatar to login state 2018-12-17 13:37:28 -08:00
Howard Stearns
719919d3fd
Merge pull request #14587 from SimonWalton-HiFi/dissectors-unobfuscate
Deobfuscate packets in dissector
2018-12-17 12:08:56 -08:00
Simon Walton
9e2b3fe820 Remove out-of-date backups on startup as well as on rule-evaluation 2018-12-17 11:39:58 -08:00
Antonina Savinova
40a3f76784
Merge pull request #14577 from davidkelly/dk/20032
Agent needs to be sure audio is ready before trying to use it
2018-12-17 10:32:42 -08:00
Jeff Clinton
a5ae4081a5
Merge pull request #14588 from wayne-chen/loginInitiative2
MS20328: New login breaks nitpick
2018-12-17 10:14:09 -08:00
Wayne Chen
711457b2d7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-17 09:12:29 -08:00
Simon Walton
d7acb7cfc5 Deobfuscate packets in wireshark lua plugin 2018-12-14 17:14:34 -08:00
Wayne Chen
899918006f fixing for autotester 2018-12-14 17:12:27 -08:00
Shannon Romano
78c9fb2b91
Merge pull request #14580 from wayne-chen/loginInitiative2
MS20319: fixing keyboard position offset
2018-12-15 00:51:03 +00:00
Shannon Romano
a89c53cc52
Merge pull request #14581 from zfox23/MS20308_unknownItems
Fix MS20308: Allow users to checkout uncertifiable items
2018-12-15 00:44:50 +00:00
Zach Fox
47a46c1d1b Fix MS20308: Allow users to checkout uncertifiable items 2018-12-14 11:17:56 -08:00