Commit graph

295 commits

Author SHA1 Message Date
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
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
Kasen IO
e101535106 Add link to top of Entites API docs for the list of entity types. 2020-03-18 14:58:32 -04:00
David Rowe
8255a50cde Update MeshProxy and Entities.getMeshes() JSDoc 2019-12-20 13:34:21 +13:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
jennaingersoll
47aa43f56a
Merge pull request #16251 from ctrlaltdavid/DOC-155
DOC-155: EntityViewer JSDoc
2019-10-07 15:45:42 -07:00
David Rowe
8b2d9427bb Update description of the entities available to the Entities API 2019-09-26 10:54:12 +12:00
David Rowe
16c33ebbec Clarify frustum property values used by Entities.findEntitiesInFrustum() 2019-09-25 19:29:20 +12:00
David Rowe
dff37a71eb Fix JSDoc markup HTML issues 2019-09-17 16:26:09 +12:00
David Rowe
4e274347b4 Fix typo in Entities.getAbsoluteJointRotationInObjectFrame() JSDoc 2019-09-04 21:05:36 +12:00
Seth Alves
f1dee1e7f8 fix uninitialized variables 2019-08-01 14:50:21 -07:00
David Rowe
a45d8924fa Miscellaneous minor JSDoc fixes noticed in passing 2019-07-11 16:31:09 +12:00
David Rowe
2d6d3eb4fe Doc review 2019-06-28 17:05:36 +12:00
David Rowe
4c8f281383 Typos etc. 2019-06-22 14:16:17 +12:00
David Rowe
eb227c6b9a Document Entities entity methods 2019-06-22 11:59:07 +12:00
David Rowe
e3f971a304 Update Entities examples to have a delay after creation before editing 2019-06-22 09:23:07 +12:00
David Rowe
52860adc1c Add callEntityMethod() and similar examples 2019-06-21 14:27:51 +12:00
David Rowe
a858314898 Remainder of Entities signals' JSDoc 2019-06-21 11:25:10 +12:00
David Rowe
0945bdaac7 Remainder of Entities methods' JSDoc 2019-06-20 15:11:01 +12:00
David Rowe
72fdbc0aa8 Entity information and manipulation 2019-06-19 10:18:48 +12:00
David Rowe
23785b5406 Regularize links to individual entity types 2019-06-15 14:06:49 +12:00
David Rowe
b16086de74 Revise JSDoc for key Entities methods plus entity properties 2019-06-15 10:44:56 +12:00
David Rowe
6299d38673 Distinguish between Uuid API and Uuid type in JSDoc 2019-06-05 14:39:05 +12:00
David Rowe
ca7ddece8b Add missing Script JSDoc 2019-05-21 10:32:12 +12:00
Zach Fox
a68da2bca7 Finish out the feature, i think 2019-05-06 11:08:23 -07:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
SamGondelman
d4e1ec9741 fix emitScriptEvent 2019-03-15 16:20:01 -07:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
SamGondelman
6ad0b3412a showKeyboardFocusHighlight + fixes 2019-01-28 20:43:47 -08:00
SamGondelman
0dd729232b simplify keyboard focus highlight 2019-01-26 22:49:12 -08:00
SamGondelman
8f0bd2449b pointerevents are working! 2019-01-26 21:53:46 -08:00
SamGondelman
5ce8f566cc more overlay wip 2019-01-25 11:10:11 -08:00
SamGondelman
0bfcde67ea remove overlays from application.cpp 2019-01-24 14:11:24 -08:00
SamGondelman
217ff2b1b2 keyboardFocusOverlay 2019-01-23 18:33:35 -08:00
David Back
5ea84fb952 CR fixes 2019-01-04 15:39:27 -08:00
David Back
eff9d11437 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-04 11:07:28 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
David Back
b92beca7d1 bad merge 2019-01-02 11:26:38 -08:00
unknown
dde7fbdfce how did these happen 2019-01-02 11:15:22 -08:00
unknown
f8f13e974d property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties 2019-01-02 11:12:10 -08:00
SamGondelman
64b461274b remove new API
(cherry picked from commit 5eccaad135)
2018-12-22 01:45:56 -05:00
SamGondelman
b5a2642b6a updated entityscriptinginterface API and related functions
(cherry picked from commit 6aac596698)
2018-12-22 00:55:10 -05:00
Sam Gondelman
097d2d9503
Revert "Case 20200: Update EntityScriptingInterface to not find local entities" 2018-12-20 16:53:33 -08:00
Shannon Romano
b6d1607acd
Merge pull request #14547 from SamGondelman/NOverlays5
Case 20200: Update EntityScriptingInterface to not find local entities
2018-12-20 19:10:22 +00:00
Shannon Romano
bb9a764855
Merge pull request #14517 from luiscuenca/getEntityJointParent
Add method to check entities joint hierarchy
2018-12-11 01:06:38 +00:00
SamGondelman
5eccaad135 remove new API 2018-12-10 13:05:39 -08:00
SamGondelman
6aac596698 updated entityscriptinginterface API and related functions 2018-12-07 15:25:21 -08:00
Alexander Ivash
72a91668a5 FB19219 Make avatarapp to handle wearables update via drag&drop 2018-12-07 11:23:17 +03:00