Commit graph

83628 commits

Author SHA1 Message Date
kasenvr
80d3e3c455
Merge pull request #520 from kasenvr/fix/move-user-agent
Fix/move user agent
2020-07-23 17:13:18 -04:00
kasenvr
d29f365830
Merge pull request #561 from HifiExperiments/zones
Make sure renderWithZones works on models on restart/reload
2020-07-23 17:08:04 -04:00
kasenvr
ac3147fa66
Merge pull request #544 from kasenvr/fix/goto-explore
Update the connection failure dialog 'go to' -> 'explore'
2020-07-23 17:05:28 -04:00
kasenvr
befdaec03b
Merge pull request #524 from JulianGro/macos-rebrand
Change strings, comments and folders to Vircadia rebrand
2020-07-23 17:04:49 -04:00
David Rowe
07504232a9 Move new connection refused reason to end to maintain compatability 2020-07-24 08:43:40 +12:00
Kasen IO
a5d0c80c87 Revert "Remove supposedly unused logic?"
This reverts commit 9fd3f764ec.
2020-07-23 00:37:50 -04:00
Kasen IO
9fd3f764ec Remove supposedly unused logic? 2020-07-23 00:18:11 -04:00
Kasen IO
d3320ab17b Separate domain vs metaverse login denials for Interface. 2020-07-23 00:18:04 -04:00
David Rowe
e4c9657ab9 Initial auxiliary groups code 2020-07-23 16:08:09 +12:00
HifiExperiments
1c8f783be6 try to fix renderWithZones from JSON 2020-07-22 14:38:33 -07:00
HifiExperiments
aa6eedf0fe make sure render with zones works on models on restart/reload 2020-07-21 12:06:38 -07:00
Kasen IO
f4016bb0d5 Add API call to retrieve user agent. 2020-07-21 02:36:55 -04:00
Kasen IO
647b45323e Update user agents. 2020-07-21 02:36:38 -04:00
kasenvr
eef1e3b93e
Update index.html 2020-07-21 01:30:56 -04:00
Kasen IO
e8d9fe852e Adjust lines for length. 2020-07-21 00:49:14 -04:00
Kasen IO
e573842786 Add compiled script files. 2020-07-21 00:43:44 -04:00
Kasen IO
78643d13e8 Update packages. 2020-07-21 00:40:21 -04:00
Kasen IO
d5bf5dfe7d Fix comma. 2020-07-21 00:38:29 -04:00
HifiExperiments
8274ee3ca9 put back old last edited logic 2020-07-20 15:10:48 -07:00
kasenvr
1c545dffca
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-07-20 14:25:52 -04:00
Kasen IO
087ede2f91 Address CR comments. 2020-07-20 13:57:28 -04:00
kasenvr
770dd83efc
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-07-20 13:51:18 -04:00
kasenvr
022be754f1
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-07-20 13:48:48 -04:00
kasenvr
de082ce61d
Update TabletConnectionFailureDialog.qml 2020-07-18 14:26:26 -04:00
kasenvr
a973855085
Update ConnectionFailureDialog.qml 2020-07-18 14:25:50 -04:00
David Rowe
233deae44d Increase graphics settings' resolution scale item maximum to 2.0 2020-07-18 20:50:52 +12:00
HifiExperiments
cbce911e83 fix lag on restart with scaled avatar 2020-07-17 14:40:40 -07:00
David Rowe
91aa878dab Typo 2020-07-17 21:02:32 +12:00
Kasen IO
ddbed5e702 Update the connection failure dialog 'go to' -> 'explore' 2020-07-17 04:24:47 -04:00
David Rowe
335bc7b4db Fix display of FBX models with only one color for vertices 2020-07-17 20:17:08 +12:00
HifiExperiments
e635d0ff87 fix alpha 0 issue 2020-07-16 15:29:58 -07:00
HifiExperiments
a7861855a7 properties update over wire 2020-07-16 14:34:02 -07:00
kasenvr
84bee76968
Merge pull request #537 from kasenvr/fix/install-docs-1
Update INSTALL.md
2020-07-16 17:16:50 -04:00
HifiExperiments
ed5c84548c Merge remote-tracking branch 'upstream/master' into parenting 2020-07-16 13:33:46 -07:00
David Rowe
62937c2bef Fix avatar not displaying when recording is re-loaded 2020-07-16 10:11:32 +12:00
David Rowe
6a6bf6a5e0 Delay taking snapshot further at low render rates 2020-07-16 08:50:10 +12:00
kasenvr
45696cd67b
Update INSTALL.md
The INSTALL step is not necessary for packaging.
2020-07-14 16:47:51 -04:00
kasenvr
69aa61174f
Merge pull request #533 from kasenvr/fix/osx-build-guide-updates
Update BUILD_OSX.md
2020-07-14 16:33:53 -04:00
kasenvr
c2e350e971
Merge pull request #536 from kasenvr/housekeeping/update-explore-app
Housekeeping/update explore app
2020-07-14 15:42:07 -04:00
Kasen IO
d705c1baaf Merge branch 'housekeeping/update-explore-app' of https://github.com/kasenvr/project-athena into housekeeping/update-explore-app 2020-07-14 14:45:57 -04:00
Kasen IO
69a18ccd1b Add sortOrder by AleziaKurdis.
Co-Authored-By: Alezia Kurdis <AleziaKurdis@users.noreply.github.com>
2020-07-14 14:45:54 -04:00
Kasen IO
9a29b5765f Add sortOrder by AleziaKurdis. 2020-07-14 14:45:29 -04:00
kasenvr
9c9ab808c8
Update BUILD_OSX.md 2020-07-13 22:55:27 -04:00
kasenvr
7b225b610a
Merge pull request #484 from ctrlaltdavid/feature/eye-tracking-option
Add option to enable/disable Vive Pro Eye eye tracking
2020-07-12 12:17:33 -04:00
David Rowe
989cd2d169 Fix Linux build error 2020-07-11 15:59:16 +12:00
Kasen IO
6c5dbb5baf Fix some errors, remove eslint file as eslint is already defined. 2020-07-10 20:19:26 -04:00
Kasen IO
ad2c3f08e6 Update further links. 2020-07-10 18:50:58 -04:00
David Rowe
8dd8ebcbaf Merge branch 'master' into feature/eye-tracking-option
# Conflicts:
#	plugins/openvr/src/ViveControllerManager.cpp
2020-07-11 08:14:13 +12:00
HifiExperiments
c9684b8c6d Merge remote-tracking branch 'upstream/master' into parenting 2020-07-10 11:43:03 -07:00
Kasen IO
629b3c084c Update user agent to use "Vircadia" + update getUserAgent function to use the same. 2020-07-10 00:08:46 -04:00