Kalila L
b1f32dd9ac
Merge branch 'pr/691' into fix/URL-migrations
2020-09-20 17:58:26 -04:00
kasenvr
68cefda3e5
Merge pull request #718 from kasenvr/feature/domain-server-metaverse-switching
...
Domain Metaverse Switching & Interface Support Improved
2020-09-18 22:55:43 -04:00
kasenvr
cf26f6bc4b
Merge pull request #694 from ctrlaltdavid/fix/import-json-textures
...
Support relative JSON URLs in model textures property
2020-09-18 17:00:13 -04:00
Kalila L
c03d1ec659
Merge branch 'master' into feature/domain-server-metaverse-switching
2020-09-16 22:55:03 -04:00
Kalila L
9b0ac9d75f
Update endpoints to be consistent and work with the updates.
2020-09-15 21:05:00 -04:00
Kalila L
e3a6dc18af
Add support for metaverse API's with paths.
2020-09-15 20:07:00 -04:00
David Rowe
432090e2e9
Quiet warning for unused blendshapeCoefficients property
2020-09-10 21:01:04 +12:00
David Rowe
dc04622a1d
Fix some JSDoc noticed in passing
2020-09-08 22:10:40 +12:00
Kalila L
58c1518d0b
Updating some .cpp and .h URLs.
2020-08-31 01:00:05 -04:00
HifiExperiments
0d62798860
Merge remote-tracking branch 'upstream/master' into parenting
2020-08-04 08:52:13 -07:00
HifiExperiments
1c8f783be6
try to fix renderWithZones from JSON
2020-07-22 14:38:33 -07:00
HifiExperiments
8274ee3ca9
put back old last edited logic
2020-07-20 15:10:48 -07:00
HifiExperiments
a7861855a7
properties update over wire
2020-07-16 14:34:02 -07:00
HifiExperiments
c9684b8c6d
Merge remote-tracking branch 'upstream/master' into parenting
2020-07-10 11:43:03 -07: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
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
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
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
2cc5679ca2
Merge pull request #435 from HifiExperiments/model
...
Possible fix for entity server crash
2020-07-04 17:38:21 -04: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
HifiExperiments
37ce2996c8
Merge remote-tracking branch 'upstream/master' into parenting
2020-07-01 14:56:36 -07:00
Kasen IO
859c78d8aa
Further updates.
2020-07-01 16:05:15 -04:00
Kasen IO
d9e0605b4d
Improve code per HiFiExperiments' suggestions.
2020-06-30 15:46:26 -04:00
Kasen IO
12446bdb45
Add ability to paste entities to any host type. Default "domain"
2020-06-30 15:18:51 -04:00
kasenvr
c7bcb03132
Merge pull request #438 from kasenvr/fix/prevent-cert-auto-remove
...
Disable Certified Entity Auto Deletion
2020-06-18 17:25:43 -04:00
HifiExperiments
56d359f2ba
Merge remote-tracking branch 'upstream/master' into parenting
2020-06-14 17:30:26 -07:00
kasenvr
951936e896
Merge pull request #425 from ctrlaltdavid/fix/delete-in-serverless
...
Fix not being able to delete entities in serverless domains
2020-06-11 17:14:34 -04:00
HifiExperiments
ef105e7de0
how about this
2020-06-10 15:56:02 -07:00
Kasen IO
f6214d46d0
Add comments indicating intent.
2020-06-09 15:07:39 -04:00
Kasen IO
49f72f0ca6
1st pass at disabling certified auto-deletion.
2020-06-08 23:38:15 -04:00
HifiExperiments
ae8879a558
possible fix for entity server crash
2020-06-08 16:58:21 -07:00
Kasen IO
fda40d56d4
Merge branch 'master' into feature/further-rebranding
2020-06-06 18:43:03 -04:00
David Rowe
5f83827198
Fix not being able to delete entities in serverless domains
2020-06-06 10:36:30 +12:00
Kasen IO
21fd10d154
Revert commit 359248829c using -m 1 to temporarily fix issue 383.
2020-06-03 16:08:18 -04:00
kasenvr
1a46b28b71
Merge pull request #62 from HifiExperiments/blendshapes
...
Support blendshapes on model entities
2020-05-31 18:34:42 -04:00
kasenvr
4cca7f6f75
Merge pull request #281 from HifiExperiments/parenting2
...
Improve performance of MyAvatar::simulate when you have lots of descendants
2020-05-31 14:47:22 -04:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings
2020-05-18 15:10:32 -04:00
0228c35d79
Update JSDOC in EntityItemPropeties.cpp to vircadia.com
...
Also strips trailing whitespaces from EntityItemProperties.cpp.
2020-05-17 14:46:33 -05:00
Dale Glass
95570d5abc
Kill the entity in processRemovedEntities before calling prepareEntityForDelete
...
This was removed back in 9d92546a#337 )
2020-05-10 18:41:03 +02:00
HifiExperiments
405d557725
Merge branch 'master' into blendshapes
2020-05-07 13:38:59 -07:00
HifiExperiments
ebc9dae78d
Merge branch 'master' into parenting
2020-05-07 13:35:32 -07:00
HifiExperiments
8017e30ab9
Merge branch 'master' into blendshapes
2020-05-07 13:27:22 -07:00
HifiExperiments
3bf690571c
Merge branch 'master' into zoneOcclusion
2020-05-07 13:13:20 -07:00
David Rowe
5e997d7b60
Fix up Vircadia URLs
2020-04-27 20:38:23 +12:00
David Rowe
2d070e630b
Merge branch 'master' into fix/jsdoc-fixes
...
# Conflicts:
# interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
# interface/resources/qml/hifi/commerce/checkout/Checkout.qml
# interface/resources/qml/hifi/commerce/purchases/Purchases.qml
# interface/src/Application.cpp
2020-04-26 20:38:43 +12:00
David Rowe
ffeb37e7aa
Merge remote-tracking branch 'hifi/master' into merge-hifi-master
...
# Conflicts:
# CMakeLists.txt
# README.md
# cmake/externals/glad32es/CMakeLists.txt
# cmake/externals/glad41/CMakeLists.txt
# cmake/externals/glad45/CMakeLists.txt
# cmake/externals/polyvox/CMakeLists.txt
# cmake/externals/quazip/CMakeLists.txt
# cmake/externals/vhacd/CMakeLists.txt
# cmake/init.cmake
# cmake/ports/hifi-deps/CONTROL
# cmake/ports/sdl2/CONTROL
# cmake/ports/sdl2/disable-hidapi-for-uwp.patch
# cmake/ports/sdl2/enable-winrt-cmake.patch
# cmake/ports/sdl2/fix-arm64-headers.patch
# cmake/ports/sdl2/fix-x86-windows.patch
# cmake/ports/sdl2/portfile.cmake
# cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
# cmake/ports/tbb/portfile.cmake
# hifi_vcpkg.py
# interface/src/avatar/MyAvatar.h
# libraries/avatars-renderer/src/avatars-renderer/Avatar.h
# libraries/avatars/src/AvatarData.h
# libraries/entities-renderer/src/RenderableEntityItem.h
# libraries/entities/src/EntityItem.cpp
# libraries/entities/src/EntityItem.h
# libraries/fbx/src/GLTFSerializer.cpp
# libraries/graphics-scripting/src/graphics-scripting/Forward.h
# libraries/networking/src/AddressManager.cpp
# libraries/networking/src/DomainHandler.h
# libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
# libraries/render-utils/src/HighlightEffect.cpp
# libraries/render-utils/src/MeshPartPayload.cpp
# libraries/render-utils/src/Model.cpp
# libraries/render-utils/src/RenderShadowTask.cpp
# libraries/script-engine/src/WebSocketClass.cpp
2020-04-09 16:46:27 +12:00
HifiExperiments
9b1635f9cc
improve performance of MyAvatar::simulate when you have lots of entity descendants
2020-04-07 15:56:32 -07:00
Kasen IO
115c40bd54
Lots of renamings, more to come.
2020-04-07 04:56:02 -04:00
HifiExperiments
eb26d9b4e3
working on parenting fixes
2020-04-06 13:41:01 -07:00
