1708 commits

Author	SHA1	Message	Date
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	a1fc1c4810	Add JSDoc for Entity preload and unload signals	2018-05-01 21:55:14 +12:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
John Conklin II	dd32ca33a5	Merge pull request #12957 from sethalves/quiet-logging ... Quiet logging	2018-04-27 14:59:38 -07:00
John Conklin II	ddedfce8a3	Merge pull request #12932 from ZappoMan/fixBug349 ... fix bug 349	2018-04-27 12:48:17 -07:00
David Rowe	08dc9b133f	Docs to JSDoc review	2018-04-26 21:10:28 +12:00
MiladNazeri	0f87e53902	Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate ... Docs/docs to js docs update	2018-04-25 12:26:19 -07:00
milad nazeri	4c736b2d62	Fixed defaults	2018-04-24 21:38:48 -07:00
David Rowe	cae9447ac5	Doc review	2018-04-25 15:09:47 +12:00
milad nazeri	23d07fa292	fixed spacing issue	2018-04-24 13:14:55 -07:00
milad nazeri	1121fe8da0	fix tabs	2018-04-23 21:47:53 -07:00
milad nazeri	4ac06fe99f	Updating previous jsdocs	2018-04-22 22:22:33 -07:00
David Rowe	941e9360dd	JSDoc fixes	2018-04-23 16:09:56 +12:00
David Rowe	d65f66a73d	Interim JSDoc for Recording	2018-04-23 14:13:29 +12:00
David Rowe	4fb55ec2af	Interim JSDoc for Users	2018-04-23 09:59:14 +12:00
David Rowe	2c39f2dbad	Interim JSDoc for Scene	2018-04-22 17:37:06 +12:00
David Rowe	62930eb576	Interim JSDoc for Script	2018-04-22 15:26:39 +12:00
David Rowe	01870af624	Interim JSDoc for ScriptDiscoveryService	2018-04-22 11:32:46 +12:00
MiladNazeri	3710ce593d	Merge pull request #12922 from ctrlaltdavid/21815 ... Controller API JSDoc	2018-04-21 10:44:05 -07:00
Seth Alves	bec39369f7	remove some uncatagorized logging, suppress some categories by default	2018-04-20 16:08:57 -07:00
David Rowe	8173ac87a8	Minor improvement to Quat.IDENTITY JSDoc	2018-04-20 16:41:10 +12:00
David Rowe	b1e214de5a	Vec3 API JSDoc	2018-04-20 16:40:15 +12:00
David Rowe	0a7cccc3f7	Move Vec2 and Vec4 JSDoc	2018-04-20 12:47:53 +12:00
milad	42471c539b	initial fixes from ctralt david's comments	2018-04-19 13:40:57 -07:00
milad	3f129bda13	More done on audio	2018-04-18 20:04:41 -07:00
ZappoMan	1a82101360	fix bug 349	2018-04-18 09:27:09 -07:00
David Rowe	9f83c606e9	Controller API JSDoc	2018-04-17 11:46:40 +12:00
MiladNazeri	e054f16c46	Merge pull request #12526 from ctrlaltdavid/21709 ... Entities API JSDoc	2018-03-12 14:40:09 -07:00
John Conklin II	42a686ad93	Merge pull request #12578 from druiz17/use-correct-audio-api ... use correct scripting api for audio in Audio.qml	2018-03-09 13:41:20 -08:00
Dante Ruiz	3a39fca268	made requested changes	2018-03-09 10:09:51 -08:00
Dante Ruiz	c49d0557fc	fixing check box issues	2018-03-09 09:29:37 -08:00
Atlante45	69fb830480	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -08:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
Sam Gondelman	1e9cfe29f2	Merge pull request #12388 from highfidelity/android ... Android Tip	2018-03-08 10:18:35 -08:00
David Rowe	a62b6b7150	Merge branch 'master' into 21709	2018-03-07 17:34:53 +13:00
Elisa Lupin-Jimenez	c6e5f4c9c8	zip file drags don't auto add model textures	2018-03-06 19:24:09 -08:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
Dante Ruiz	55d8cfd4c1	make sure dont make audio devices that don't use stereo use stereo	2018-03-02 10:56:44 -08:00
David Rowe	d82a300f5f	Miscellaneous JSDoc improvements	2018-03-01 09:58:35 +13:00
David Rowe	3275846882	Material entity JSDoc	2018-03-01 09:57:42 +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
Brad Davis	3e552e5739	Fix warnings	2018-02-26 09:53:35 -08:00
humbletim	f8fe06213d	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:11:23 -05:00
humbletim	72fca7e57e	Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge	2018-02-22 05:18:05 -05:00
humbletim	be8d79f53f	CR fedback and cleanup	2018-02-22 05:15:01 -05:00
SamGondelman	4c6169ec78	merge and a little cleanup	2018-02-20 15:45:34 -08:00
humbletim	5791ca4c51	interim checkin	2018-02-20 12:22:04 -05:00
David Rowe	86a6f73fb4	Quat JSDoc improvement	2018-02-19 12:21:21 +13:00
Andrew Meadows	96c97547f9	Merge pull request #12205 from jherico/no_widgets ... Remove some unneeded Qt dependencies	2018-02-05 15:32:54 -08:00
humbletim	06afaa7470	BufferView <-> QVariant/QScriptValue conversion ... update MeshProxy/SimpleMeshProxy and ScriptableModel ModelScriptingInterface / scriptable::ModelProvider integration update to RC-63 initial graphics-scripting refactoring graphics-scripting baseline commit wip commit Geometry -> MeshPart remove SimpleMeshProxy collapse graphics-utils -> graphics-scripting scriptable::Model => scriptable::ScriptableModel	2018-02-01 16:30:29 -05:00