Commit graph

83442 commits

Author SHA1 Message Date
kasenvr
d585b068b4
Merge pull request #521 from kasenvr/feature/inventory-app
Feature/inventory app
2020-07-23 17:15:37 -04:00
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
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
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
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
Kasen IO
ddbed5e702 Update the connection failure dialog 'go to' -> 'explore' 2020-07-17 04:24:47 -04:00
kasenvr
84bee76968
Merge pull request #537 from kasenvr/fix/install-docs-1
Update INSTALL.md
2020-07-16 17:16:50 -04: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
Kasen IO
629b3c084c Update user agent to use "Vircadia" + update getUserAgent function to use the same. 2020-07-10 00:08:46 -04:00
kasenvr
ec7ad0d805
Merge pull request #526 from kasenvr/v2020.2.2-rc
V2020.2.2 rc -> master
2020-07-09 17:35:59 -04:00
kasenvr
4b3765c9b3
Merge pull request #507 from AleziaKurdis/issue398
JS Doc update for enterEntity signal.
2020-07-09 17:34:35 -04:00
kasenvr
d5b5bdc382
Merge pull request #505 from daleglass/increase_max_texture_size
Increase maximum texture size to 8192
2020-07-09 17:33:51 -04:00
kasenvr
56b6d370fb
Merge pull request #504 from kasenvr/fix/import-entities-any-domain
Import entities now works on domains that you do not have rights on.
2020-07-09 17:18:48 -04:00
kasenvr
c7a5dd28a0
Merge pull request #499 from JulianGro/patch-1
Update BUILD_OSX.md
2020-07-09 17:18:02 -04:00
kasenvr
ab95e109ca
Merge pull request #468 from JulianGro/move-audio
Little "Audio" settings UI improvements
2020-07-09 17:15:35 -04:00
kasenvr
f5b854d411
Merge pull request #466 from daleglass/move-android-downloads
Change Android URLs to Linode bucket, old HiFi one is gone
2020-07-09 17:14:21 -04:00
kasenvr
cf2beb6c96
Merge pull request #387 from ctrlaltdavid/feature/openvr-linux
Build OpenVR plugin on Linux
2020-07-09 17:10:29 -04:00
David Rowe
6e1af6df73 Update copyright notices 2020-07-10 07:18:29 +12:00
Julian Groß
dce34b8d90 Change strings, comments and folders to Vircadia 2020-07-09 16:03:07 +02:00
Kasen IO
6d981b25b4 Move inventory.js back to system scripts. 2020-07-08 17:26:40 -04:00
Kasen IO
343f883ac3 Perform CR updates. 2020-07-08 14:33:53 -04:00
Kasen IO
c074f7573c Move inventory-app to unpublished, folder named for future pkg manager. 2020-07-08 14:31:37 -04:00
Kasen IO
ebc8f7db4c Merge branch 'master' into feature/inventory-app 2020-07-08 14:27:59 -04:00
Kasen IO
3ccaa46563 Update API docs URLs. 2020-07-08 14:18:32 -04:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
Alezia Kurdis
6c24f646bb
Added an hyperlink to preload in enterEntity JSdoc
1- Added an hyperlink to "preload" signal in enterEntity JSdoc.
2- Removed the useless 
", but only if the entity has an entity method exposed for this event." 
from "enterEntity" and "leaveEntity" JSdoc (lines 2402 and 2413)
2020-07-07 23:05:24 -04:00
Julian Groß
9d2785f4e5
Update BUILD_OSX.md
Co-authored-by: kasenvr <52365539+kasenvr@users.noreply.github.com>
2020-07-07 04:51:28 +02:00
kasenvr
f22c56038c
Update libraries/octree/src/Octree.h
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-07-06 22:21:39 -04:00