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
kasenvr
cf41ed40ae
Merge pull request #498 from HifiExperiments/particle
...
Properly pause particles when you look away
2020-07-02 23:00:58 -04:00
Kasen IO
fe7f89cc1b
Merge branch 'master' into fix/gltf-corrupt-crash
2020-07-02 21:36:21 -04:00
Julian Groß
cdb770b407
move npm into dependencies
2020-07-03 03:27:45 +02:00
kasenvr
fb1b1aaa50
Merge pull request #485 from kasenvr/fix/chat-optimizations
...
Fix/chat optimizations
2020-07-02 18:50:45 -04:00
Julian Groß
567b793b17
Update BUILD_OSX.md
2020-07-02 22:49:01 +00:00
kasenvr
bfe08f23c7
Merge pull request #497 from kasenvr/feature/paste-entities-host-type
...
Add ability to paste entities to any host type
2020-07-02 17:29:13 -04:00
kasenvr
11ce437987
Merge pull request #486 from ctrlaltdavid/fix/sandbox-ui-tweak
...
Improve wording of Sandbox's get/set private user data descriptions
2020-07-02 17:26:56 -04:00
kasenvr
d6d79c3a95
Merge pull request #481 from daleglass/fix_avx_crash
...
Fix illegal instruction in libaudio.dylib on OSX
2020-07-02 17:21:15 -04:00
Dale Glass
cb7ab63061
Change to Vircadia CDN URLs
2020-07-02 23:15:25 +02:00
kasenvr
b7b902b755
Merge pull request #459 from ctrlaltdavid/feature/tutorial-menu-item
...
Add Help > Tutorial menu item
2020-07-02 17:10:38 -04:00
kasenvr
e1ab52d97e
Apply suggestions from code review
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-07-02 16:52:12 -04:00
Kasen IO
fd2691fa15
Some code cleaning.
2020-07-01 19:54:14 -04:00
Kasen IO
05ceedaa3f
Fix grid chat notification sound.
2020-07-01 19:17:54 -04:00
Kasen IO
f74f0e8a53
Update path reference.
2020-07-01 18:19:13 -04:00
HifiExperiments
11ad64c606
properly pause particles when you look away
2020-07-01 14:37:09 -07:00
Kasen IO
859c78d8aa
Further updates.
2020-07-01 16:05:15 -04:00
Kasen IO
5f0caf7de8
Update pasteEntities to const per suggestion.
2020-07-01 01:29:47 -04:00
Kasen IO
c99a62b719
Indent + convert emojis to code form.
2020-06-30 19:33:42 -04:00
Kasen IO
16ef73c6f7
Merge branch 'master' into fix/chat-optimizations
2020-06-30 19:06:47 -04:00
kasenvr
c3c6ad47da
Apply suggestions from code review
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-06-30 18:57:32 -04:00
