Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
68372 commits 29 branches 0 tags 1.1 GiB
Commit graph

236 commits

Author SHA1 Message Date
David Rowe
b5028a9626 Merge branch 'master' into 21880 
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
 2018-06-05 09:13:54 +12:00
John Conklin II
ec3f9549f1
Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934 
Fix EntityScriptingInterface::getChildrenIDs function
 2018-05-31 14:27:25 -07:00
David Rowe
ac0607b5ae Review Entites.cloneEntity() JSDoc and add JSDoc for new properties 2018-05-30 10:02:10 +12:00
Liv Erickson
56493346c1 fix permissions check 2018-05-22 15:41:48 -07:00
Liv Erickson
ec8aa71dc4 Add JSDoc header to new clone function in Entity API 2018-05-17 11:25:20 -07:00
Wayne Chen
92e9a8e064 fixing typo in documentation. 2018-05-15 16:32:01 -07:00
Wayne Chen
f82e597ac7 Updating documentation for getChildrenIDs + fixing issue #1934 2018-05-15 09:34:07 -07:00
David Back
3031bb05be Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-11 17:54:20 -07:00
David Rowe
fab85c3f6d Fix JSDoc function definitions specifying properties instead of params 2018-05-11 09:52:48 +12:00
David Back
3241c18271 first pass cloneables WIP 2018-05-09 18:10:40 -07:00
David Rowe
1aa28b7f54 Merge remote-tracking branch 'upstream/master' into 21856-d 
# Conflicts:
#	interface/src/LODManager.h
 2018-05-02 07:50:55 +12:00
David Rowe
2cc3ed6287 List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
David Rowe
8d71d72258 Fix JSDoc for Entities.findEntitiesByName 2018-04-28 13:16:26 +12:00
David Rowe
08dc9b133f Docs to JSDoc review 2018-04-26 21:10:28 +12:00
John Conklin II
cb7b03652b
Merge pull request #12796 from MiladNazeri/feature/add-findByName 
added Entities.findbyName
 2018-04-25 14:00:10 -07:00
milad
988dca437d added case-sensitive search 2018-04-16 18:30:00 -07:00
David Rowe
c1ede6ef58 Merge branch 'master' into 21815 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12:00
David Rowe
7a9e3388fa Merge branch 'master' into 21801 2018-04-12 09:48:51 +12:00
milad
4adc8928f0 added Entities.findbyName 2018-04-05 09:58:54 -07:00
David Rowe
7027ccb6d8 Remove unused code 2018-03-30 09:35:25 +13:00
David Rowe
3b90078097 Remove Entities.currentAvatarEnergy and related from the API 2018-03-30 08:36:18 +13:00
David Rowe
b35ee5ce8a Fix JSDoc links to Vec3 constants 2018-03-28 12:25:49 +13:00
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