Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 13:06:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75248 commits 29 branches 28 tags 1.2 GiB
Commit graph

75248 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature 2019-01-16 17:24:22 -08:00
Wayne Chen
673c4ad434 fixing error message spacing 2019-01-16 17:22:00 -08:00
Wayne Chen
3ad0f60dd5 fixing error message spacing 2019-01-16 17:20:01 -08:00
Wayne Chen
116a15afe8 removing oculus userID to server - no need 2019-01-16 17:15:40 -08:00
Wayne Chen
6d10d9d043 Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature 2019-01-16 17:08:24 -08:00
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
Wayne Chen
f983d16cc1 linking oculus acct creation to spinner 2019-01-16 17:03:44 -08:00
Wayne Chen
8c2dee20a0 adding final create failure message handling, ui improvements 2019-01-16 15:23:56 -08:00
Stephen Birarda
0a9ac72e7b
Merge pull request #14720 from birarda/add-comments-to-atv 
pepper AssociatedTraitValues with some needed comments
 2019-01-16 10:59:08 -08:00
Wayne Chen
aa6b819149 fixing desktop login page crash 2019-01-16 10:50:29 -08:00
birarda
a63c2b3e29 pepper AssociatedTraitValues with some needed comments 2019-01-16 10:15:04 -08:00
Wayne Chen
7868d013d0 filling username with oculus username, checking create error 2019-01-16 09:43:48 -08:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d 
Make mouselook directly proportional to right-click mouse
 2019-01-16 09:09:38 -08:00
John Conklin II
7c06c18fe4
Merge pull request #14699 from ingerjm0/api-directory 
JSDoc > Grav directory change
 2019-01-15 18:15:11 -08:00
Wayne Chen
b62ab05079 removing isLogIn 2019-01-15 17:49:51 -08:00
Antonina Savinova
560c44a74a
Merge pull request #14697 from howard-stearns/more-log-purge 
log purge
 2019-01-15 16:19:03 -08:00
Stephen Birarda
73a5f30350
Merge pull request #14709 from birarda/add-traits-to-dissectors 
add message fragment handling to wireshark dissectors
 2019-01-15 12:06:18 -08:00
Wayne Chen
3c0f3c81bd adding blur to login bg 2019-01-15 12:02:08 -08:00
Wayne Chen
9b3caf2ac1 adding changes to forms 2019-01-15 12:01:30 -08:00
Shannon Romano
4b34465113
Merge pull request #12899 from kitely/warn-property-too-large 
Log a warning if an entity's property is too large
 2019-01-15 12:00:04 -08:00
Shannon Romano
eed53f60ba
Merge pull request #14556 from vladest/avatar_app_warnings 
Fix Avatar apps warnings.
 2019-01-15 11:03:43 -08:00
Shannon Romano
0089b91eea
Merge pull request #14609 from sethalves/fb-20280 
fix a couple shutdown crashes and a class of asan warning
 2019-01-15 10:59:08 -08:00
Shannon Romano
547f167539
Merge pull request #14654 from kencooke/audio-injector-stereo-distattn-bugfix 
Fix the distance attenuation of stereo local injectors
 2019-01-15 10:54:54 -08:00
Wayne Chen
8fbac14d27 adding tablet close upon login 2019-01-15 10:02:00 -08:00
Wayne Chen
60d867c51f adding sending oculus ID including username 2019-01-14 17:57:23 -08:00
Antonina Savinova
6499c4f0ea
Merge pull request #14700 from SimonWalton-HiFi/update-icons 
New icons for interface and server-console
 2019-01-14 16:04:55 -08:00
Antonina Savinova
89600f4880
Merge pull request #14701 from roxanneskelly/Case20615 
Case20615 - Changing Avatars doesn't update to everyone intermittently
 2019-01-14 14:44:35 -08:00