798 commits

Author	SHA1	Message	Date
Elisa Lupin-Jimenez	14935e5924	added const to valid inputs	2017-12-19 15:11:24 -08:00
Elisa Lupin-Jimenez	1b6c85edb0	cleaned up code	2017-12-19 13:22:31 -08:00
Elisa Lupin-Jimenez	34d8fe307d	fixed getAssetList()	2017-12-19 11:25:15 -08:00
Elisa Lupin-Jimenez	8a9e5bc39d	Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api	2017-12-19 10:41:39 -08:00
Elisa Lupin-Jimenez	1ee8445f43	added gltf import feature, getAssetList() not working	2017-12-18 17:47:21 -08:00
Elisa Lupin-Jimenez	e7fad05867	enabled fbx, obj, and blocks model url retrieval	2017-12-18 14:20:51 -08:00
Andrew Meadows	cfd2097f36	Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js ... Cleanup names of debug stats and trace contexts.	2017-12-18 10:02:42 -08:00
Elisa Lupin-Jimenez	264f362994	resolved merge conflict again	2017-12-13 17:54:30 -08:00
Elisa Lupin-Jimenez	e49181c3a2	added getAssetList() and getFBX()	2017-12-13 17:45:57 -08:00
Elisa Lupin-Jimenez	f7be67b5b2	removed key	2017-12-13 16:19:36 -08:00
Elisa Lupin-Jimenez	392f290dd6	can fetch poly asset list synchronously	2017-12-13 16:19:36 -08:00
Elisa Lupin-Jimenez	dc999401d5	Created poly scripting interface template	2017-12-13 16:19:36 -08:00
Zach Fox	f0507e1608	Merge pull request #11972 from zfox23/commerce_fixWalletStatus1 ... Set Wallet Status to 'Ready' after correctly authenticating wallet	2017-12-13 13:19:54 -08:00
Zach Fox	efd5c0ccb7	Add comment as per CR	2017-12-13 11:53:26 -08:00
Andrew Meadows	87fa919ac8	save files to Documents by default	2017-12-12 14:11:25 -08:00
Zach Fox	623e6395be	Set Wallet Status to 'Ready' after correctly authenticating wallet	2017-12-12 13:01:14 -08:00
MiladNazeri	16e16501cd	Merge pull request #11791 from ctrlaltdavid/21602 ... JSDoc updates	2017-12-12 12:18:02 -08:00
Andrew Meadows	2538204b1e	expose physics simulation stats to Test JS API	2017-12-11 11:31:00 -08:00
Sam Gateau	0ff91e5926	Merge pull request #11952 from samcake/light ... Exposing multi highlight and selection feature to js api	2017-12-12 01:09:15 +07:00
Sam Gateau	cc4b266647	Add names to objects of the selection, remove comments in shader and fix one more warning on linux	2017-12-11 00:31:54 -08:00
Sam Gateau	bb888f2d4c	Replace the name opacity for alpha	2017-12-10 23:07:06 -08:00
Sam Gateau	eec4e966a7	Fix the linux build and correct the name of the property Intensity to Opacity	2017-12-10 10:13:49 -08:00
Zach Fox	6f5028080b	Remove useless Wallet.buy() scripting endpoint	2017-12-08 18:23:23 -08:00
samcake	9a4f667059	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-08 08:50:33 -08:00
Seth Alves	91b2d8df8a	Merge pull request #11874 from luiscuenca/audioscope ... Improve Audio Scope	2017-12-08 07:15:28 -08:00
samcake	7a9d77fed4	return a legit selectedItemsList js object as long as the list exist, only void if the list name is unknown	2017-12-07 17:53:30 -08:00
samcake	ace8e153c2	making sure the ID of an object in the Selection list is unique and more refined debugging	2017-12-07 17:45:40 -08:00
samcake	6148458aeb	Workable state, need final clean up and testing	2017-12-07 16:04:08 -08:00
samcake	5f85e8e2cb	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-07 08:48:12 -08:00
Sam Gateau	0245a7005d	Adding the query of a particular selection content	2017-12-06 22:44:58 -08:00
samcake	5500a6d11c	More to come	2017-12-06 18:02:30 -08:00
Elisa Lupin-Jimenez	1d5875c45b	removed key	2017-12-06 17:40:39 -08:00
Elisa Lupin-Jimenez	66b6be1302	fixed weird merge conflicts	2017-12-06 17:37:44 -08:00
Elisa Lupin-Jimenez	4ed689672e	can fetch poly asset list synchronously	2017-12-06 16:07:29 -08:00
samcake	1483195285	almost complete setup working, yeah	2017-12-05 18:27:53 -08:00
luiscuenca	8abe8b9879	move save logic to audioclient	2017-12-05 18:22:14 -08:00
luiscuenca	20d6615417	emit only when recording	2017-12-05 16:13:44 -08:00
Elisa Lupin-Jimenez	d6e1a9defe	Created poly scripting interface template	2017-12-05 09:43:01 -08:00
samcake	de410b6833	I need a color editor	2017-12-04 17:29:01 -08:00
Elisa Lupin-Jimenez	7bb44f4139	Created poly scripting interface template	2017-12-04 16:46:58 -08:00
luiscuenca	4030688e7a	added record wav files	2017-12-03 11:54:37 -07:00
SamGondelman	c5ebb8a279	expose Window.getDeviceSize()	2017-11-28 16:16:30 -08:00
samcake	1514cdfb2f	extend the set of interface for multi highlight	2017-11-21 17:59:45 -08:00
samcake	aa163db4e6	Trying to make selection threadsafe	2017-11-20 17:21:15 -08:00
samcake	e0740b323d	keep debuging the seelction highlight	2017-11-17 18:11:18 -08:00
samcake	08dd76c9a8	changes of the day	2017-11-16 17:52:12 -08:00
Sam Gateau	3a0b2651d5	Keep spinning on the bridge between js interface and the highlighting feature	2017-11-16 00:55:51 -08:00
samcake	771c64fc97	Working on the selection highlight js interface	2017-11-15 18:21:07 -08:00
David Rowe	4f083a1b20	Further Menu API JSDoc improvements	2017-11-16 13:39:14 +13:00
David Rowe	bdb1bbe88d	Menu API JSDoc improvements	2017-11-16 13:34:50 +13:00