Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 18:38:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83345 commits 76 branches 59 tags 1.2 GiB
Commit graph

83345 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
bcb469a29d
Merge pull request #571 from ctrlaltdavid/feature/oauth2-login-required 
Domain login groups and "not authorized on domain"
 2020-07-25 09:16:03 +12:00
David Rowe
0b667e34a2 Regularize naming 2020-07-24 22:02:23 +12:00
David Rowe
6d310eb999 Generate "NotAuthorizedDomain" condition 2020-07-24 21:22:00 +12:00
David Rowe
9b13f0bebb Merge branch 'feature/oauth2-groups' into feature/oauth2-login-required 2020-07-24 11:14:47 +12:00
David Rowe
2e9355da58 Distinguish not logged into metaverse vs domain 2020-07-24 11:13:41 +12: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
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
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
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
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
Julian Groß
6737068b02 Test 2020-07-07 00:28:19 +02:00
David Rowe
96ae709720 Update copyrights 2020-07-06 20:40:55 +12:00
David Rowe
5e52812747 Prevent excessive logging of a SteamVR event on Linux 2020-07-06 20:01:28 +12:00
David Rowe
3433ca3b02 Merge branch 'master' into feature/openvr-linux 2020-07-06 18:48:35 +12:00
Alezia Kurdis
a78446dbef
JS Doc update for enterEntity 
JS Doc update for enterEntity:
Triggered when an avatar enters an entity, but only if the entity has an entity method exposed for this event. Note: At the initial loading of the script, if the avatar is already present inside the entity, it might be too late to catch this event when the script runs, so it won't trigger. The 'preload' signal can be used to handle those cases.

To solve issue #398
 2020-07-04 23:15:10 -04:00
kasenvr
bc249abe48
Merge pull request #474 from kasenvr/fix/anim-warning-spam 
Reduce Missing Joint Log Spam
 2020-07-04 19:46:59 -04:00
David Rowe
52389e5804 Add correct privacy policy URL 2020-07-05 11:17:56 +12:00
kasenvr
2cc5679ca2
Merge pull request #435 from HifiExperiments/model 
Possible fix for entity server crash
 2020-07-04 17:38:21 -04:00
kasenvr
ed2894a9f9
Merge pull request #480 from kasenvr/fix/gltf-corrupt-crash 
Prevent a crash for corrupted GLTF models.
 2020-07-04 17:20:24 -04:00
Kasen IO
44e5bbb591 Add init for timer to constructor. 2020-07-04 00:48:03 -04:00
Dale Glass
9f25891639 Increase maximum texture size to 8192 2020-07-03 23:43:18 +02:00
Kasen IO
7ba3eba3b9 Add missing constant. 2020-07-03 16:44:41 -04:00
Kasen IO
afc23954c5 Import entities now works on domains that you do not have rights on. 2020-07-03 16:37:02 -04:00
Kasen IO
0ad7e25b49 Revise names. 2020-07-03 14:40:56 -04:00
Kasen IO
4c780a5997 Merge branch 'master' into fix/anim-warning-spam 2020-07-03 13:31:51 -04:00
motofckr9k
bb91c1c89b Fix blocks 2020-07-03 10:22:06 +02:00
Kasen IO
fe0109aa13 Fix crash for indices out of bounds in GLTF. 
Co-Authored-By: hifiexperiments <hifiexperiments@users.noreply.github.com>
 2020-07-02 23:52:26 -04:00