Commit graph

213 commits

Author SHA1 Message Date
David Rowe
4b52c21d1c JSDoc that an entity's clientOnly property can be set at entity creation 2018-03-20 09:51:10 +13:00
David Rowe
d4487e92b8 Further JSDoc tweaks 2018-03-08 12:23:13 +13:00
David Rowe
e2bf84224a Add further examples. 2018-03-08 10:59:12 +13:00
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
David Rowe
eeb7f5ca8d Doc review 2018-03-07 17:29:39 +13:00
David Rowe
f9086e31de Deprecate Entities.getMeshes() in favor of using the new Graphics API 2018-03-01 10:08:50 +13:00
David Rowe
d82a300f5f Miscellaneous JSDoc improvements 2018-03-01 09:58:35 +13:00
David Rowe
1bb8a0fb18 Fix up entity script calling JSDoc 2018-02-28 12:54:49 +13:00
David Rowe
a782b6779a Merge branch 'master' into 21709
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
2018-02-28 12:42:05 +13:00
David Rowe
9c1fa7a8d2 Miscellaneous JSDoc tidying and fixes 2018-02-28 11:44:03 +13:00
David Rowe
9f6f6a9b0d Entities scripts JSDoc 2018-02-28 10:31:34 +13:00
David Rowe
483688a6e1 Web entity EventBridge functions JSDoc 2018-02-28 08:40:36 +13:00
David Rowe
1fb02d15d7 Entities actions JSDoc 2018-02-27 14:12:20 +13:00
Elisa Lupin-Jimenez
b56c78d36c image has correct orientation and is collisionless 2018-02-26 14:44:46 -08:00
David Rowe
c2d8c96463 Entities collisions JSDoc 2018-02-26 14:10:33 +13:00
David Rowe
2d9d6035fc Entities mouse and controller events JSDoc 2018-02-26 10:20:31 +13:00
David Rowe
26404a6ce8 Entities functions JSDoc bulk 2018-02-23 19:27:13 +13:00
David Rowe
67cfe783be Entity properties JSDoc 2018-02-19 12:17:31 +13:00
Zach Fox
ae8a8a48eb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-13 13:55:32 -08:00
Zach Fox
95e9eb8e4a Lots of progress 2018-02-12 17:06:57 -08:00
Elisa Lupin-Jimenez
9f8e2017ce can add image directly from asset server 2018-02-02 10:27:44 -08:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete
JS scripting console auto-complete
2018-01-31 10:39:51 -08:00
Thijs Wenker
ce50380698 fix JSAPI typo 2018-01-25 22:47:35 +01:00
humbletim
a146b778f7 support additional .extraInfo for ray intersections 2017-12-21 12:35:13 -05:00
Zach Fox
7113a72f2e Bugfixes 2017-12-12 18:04:20 -08:00
Zach Fox
f5df83667f Add getStaticCertificateJSON() to Entity Scripting Interface 2017-12-12 15:50:04 -08:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
Sam Gondelman
863a2041a6 Merge branch 'master' into pointerEvents 2017-10-25 17:22:19 -07:00
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -07:00
ZappoMan
1128a98e88 implement callEntityClientMethod 2017-10-24 11:15:57 -07:00
Zach Fox
cda43ec1ea Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-23 11:52:59 -07:00
ZappoMan
934c9479af implement support for Entities.callEntityServerMethod() 2017-10-21 20:27:35 -07:00
Zach Fox
74180bc4cd Implement static cert verification correctly 2017-10-19 16:39:13 -07:00
SamGondelman
5bfb0baf09 const references 2017-10-13 14:38:46 -07:00
SamGondelman
cc8ecdc596 put back entity signals for scripts 2017-10-12 17:28:00 -07:00
SamGondelman
53fde83922 cleaning up pointerevents, wip 2017-10-12 11:21:50 -07:00
Howard Stearns
73c8da99dc Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-29 16:46:43 -07:00
Howard Stearns
58255abe12 animation url and computing certificateID 2017-09-29 16:32:25 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463)
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
SamGondelman
a641fb7a7f rename qvector findRayIntersection to avoid script conflicts 2017-08-15 18:03:52 -07:00
SamGondelman
3645bf04b6 possibly fix most annoying crash 2017-08-08 18:10:53 -07:00
Liv Erickson
ae458dcbcf changing models to more generally reference entities in comment 2017-05-15 20:33:22 -07:00
Liv Erickson
a606f8a8d4 Fixing code style 2017-05-15 20:28:48 -07:00
Liv
08eb6442b5 Add function findEntitiesByType EntityScriptingInterface
Updated EntityScriptingInterface.cpp and .h to create a new function for
the Entities API that can be called to filter out entities found by a
specific entity type.
2017-05-15 18:36:36 -07:00
Seth Alves
a7c684e007 entity scripting call to get the nestable-type of an object, by id 2017-05-04 19:05:29 -07:00
Seth Alves
8da91695df Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-27 20:15:54 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00