Commit graph

30952 commits

Author SHA1 Message Date
kasenvr
7a686d95e0
Merge pull request #671 from ctrlaltdavid/fix/gltf-blendshapes
Fix and extend glTF blendshapes support
2020-09-03 13:57:57 -04:00
kasenvr
bbc5044451
Merge pull request #639 from ctrlaltdavid/enhancement/domain-login-items
Don't display domain log-in items unless relevant
2020-09-02 18:51:14 -04:00
kasenvr
e2c5504be4
Merge pull request #441 from odysseus654/pr/cxx-crashing
improve crashpad reporting of unhandled c++ exceptions
2020-09-02 18:51:01 -04:00
kasenvr
c7fbddf024
Merge pull request #631 from vegaslon/bug/TestFixAvatarApp
Test moving to qt image error handling in avatar app
2020-09-02 18:50:31 -04:00
kasenvr
9004fb8060
Merge pull request #624 from ctrlaltdavid/feature/vircadia-about
Add "About" JavaScript API and platform string
2020-09-02 18:50:09 -04:00
Kalila L
b8181d92a5 Merge branch 'master' into pr/441 2020-09-01 17:42:35 -04:00
kasenvr
f2cc30d6d9
Merge pull request #276 from HifiExperiments/parenting
Improving performance of entity updates
2020-09-01 04:34:51 -04:00
David Rowe
77dbe7a254 Rename FACESHIFT_BLENDSHAPES to BLENDSHAPE_NAMES 2020-08-29 11:21:56 +12:00
David Rowe
67100b5a20 Display domain login menu item only on domains that have domain login 2020-08-23 15:56:27 +12:00
Vegaslon
c6fbe08a8f Test moving to qt image error handling instead of creating own in attempt to fix avatar app slow down. 2020-08-20 08:59:57 -04:00
David Rowe
bf60cf5b4c Tidying 2020-08-18 16:33:47 +12:00
David Rowe
9bb5add1ca Don't display domain login status in title bar unless relevant 2020-08-18 11:42:35 +12:00
David Rowe
66cdefa4b3 Add a new "About.platform" property 2020-08-17 11:47:56 +12:00
David Rowe
70fd954ef4 Replace the "HifiAbout" API with a new "About" API 2020-08-17 11:34:58 +12:00
Kasen IO
95e0907b90 Merge branch 'master' into oauth2-wordpress 2020-08-06 19:11:11 -04:00
David Rowe
81c402ab9c Code review 2020-08-06 21:40:36 +12:00
kasenvr
3ba78163da
Update PerformanceManager.cpp
I got that typo for sure this time.
2020-08-06 01:12:37 -04:00
Kasen IO
9607491ea2 Add graphics settings menu bar button. 2020-08-05 23:37:45 -04:00
Kasen IO
5ba33a521f Merge branch 'master' into oauth2-wordpress 2020-08-05 15:41:13 -04:00
David Rowe
8f0b33b54d Miscellaneous tidying 2020-08-06 00:04:22 +12:00
Kasen IO
d89cf867d2 Center error text correctly. 2020-08-05 02:41:39 -04:00
kasenvr
b948f24a56
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-08-05 02:31:26 -04:00
kasenvr
4d3ca2fdc5
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-08-05 02:31:10 -04:00
Kasen IO
658e14be25 Remove unused aliases. 2020-08-05 02:30:30 -04:00
Kasen IO
6b0fc8fd66 Titlebar now responds correctly to domain logged in state. 2020-08-05 02:18:01 -04:00
Kasen IO
c42adc9e00 Add menu items and triggers. 2020-08-05 00:14:27 -04:00
Kasen IO
2881f1147f Metaverse login display working correctly. 2020-08-05 00:09:09 -04:00
Kasen IO
d81ec3a4b8 Domain login display working correctly. 2020-08-04 23:46:39 -04:00
Kasen IO
8f55e13aa2 Disable login screen for all first-time users. 2020-08-04 23:14:40 -04:00
Kasen IO
352a3f4ab1 Fix domain vs metaverse logins slightly. 2020-08-04 21:17:57 -04:00
Kasen IO
0e8f019b8a Further things kinda working. 2020-08-04 20:00:24 -04:00
Kasen IO
ffce0a9d27 Update QML. 2020-08-04 19:12:31 -04:00
Kasen IO
09f2153057 Update login QML to display domain URL. 2020-08-04 15:48:10 -04:00
Kasen IO
f066eccba0 Merge branch 'oauth2-wordpress' into feature/oauth2-kalila 2020-08-04 14:17:48 -04:00
HifiExperiments
0d62798860 Merge remote-tracking branch 'upstream/master' into parenting 2020-08-04 08:52:13 -07:00
David Rowe
3a43283e7b Provide domain name to domain login dialog 2020-08-04 19:42:02 +12:00
Kasen IO
482922d986 First pass at making login dialog more clear. 2020-08-04 01:28:19 -04:00
David Rowe
7da91d9557 Misc. tidying 2020-08-04 09:15:05 +12:00
David Rowe
257eadc99f "Unable connect to this domain" message box after login if can't connect 2020-08-03 16:12:13 +12:00
David Rowe
56ba137ee3 Get OAuth2 URL from server settings 2020-07-31 20:48:27 +12:00
David Rowe
6b28f3ea0d Reinstate TODOs 2020-07-31 15:20:13 +12:00
kasenvr
856e1f1ca3
Update interface/src/ui/DialogsManager.cpp
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-07-30 22:25:24 -04:00
kasenvr
7a25376131
Merge pull request #574 from ctrlaltdavid/fix/url-parameter
Fix --url command line parameter to work with both "=" and " "
2020-07-30 17:18:54 -04:00
kasenvr
180b7f1bd3
Merge pull request #547 from HifiExperiments/scaled
Fix lag on restart with scaled avatar
2020-07-30 17:15:50 -04:00
Kasen IO
af34536a09 Further complete the loop. 2020-07-30 00:34:02 -04:00
Kasen IO
5706a42b56 Implement further handling of Interface OAuth2
This is preliminary, needs to be revisited in a more dynamic and clean fashion with time.
2020-07-29 01:53:21 -04:00
David Rowe
c6af3d23c9 Fix --url command line parameter to work with both "=" and " " 2020-07-26 19:41:30 +12:00
David Rowe
ed44438387 Fix domain login dialog disappearing when teleport to domain 2020-07-25 21:46:18 +12:00
David Rowe
361ab97d83 Fix saving metaverse login 2020-07-25 20:53:23 +12:00
David Rowe
0618427d0f Wire up domain login dialog 2020-07-25 20:40:52 +12:00