780 commits

Author	SHA1	Message	Date
Triplelexx	78a0175413	fix assetbrowser sorting case sensitivity	2017-12-29 23:16:12 +00: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
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
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
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
samcake	de410b6833	I need a color editor	2017-12-04 17:29:01 -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
samcake	d4f93b9203	Adding style from VariantMap	2017-11-14 18:21:02 -08:00
Sam Gateau	fc53c26190	drafting the interface	2017-11-14 00:40:37 -08:00
samcake	fd46aa15ff	adding occluded/visisble to highlight outline	2017-11-13 17:23:21 -08:00
David Rowe	4a84116877	Merge branch 'master' into 21602	2017-11-14 08:27:13 +13:00
David Rowe	2119e01ac3	Tidying	2017-11-13 11:59:21 +13:00
David Rowe	9d9f684af5	Tidying	2017-11-12 11:44:51 +13:00
David Rowe	f5e155bf94	Expand Menu's JSDoc	2017-11-11 17:01:55 +13:00
David Rowe	c8734ccd63	Menu JSDoc improvements	2017-11-11 16:18:05 +13:00
David Rowe	a576cc04e1	Clipboard JSDoc improvements	2017-11-11 16:16:24 +13:00
David Rowe	c77a12f5fa	Update Clipboard and Menu JSDoc to use JavaScript type names	2017-11-11 07:55:57 +13:00
David Rowe	036ac8de6d	Update JSDoc for Menu JavaScript API	2017-11-10 21:55:42 +13:00
David Rowe	875b9846a0	Remove unused signal	2017-11-10 21:55:03 +13:00
David Rowe	7bbe5cdf70	Update JSDoc for Clipboard JavaScript API	2017-11-10 21:53:55 +13:00
Sam Gateau	e145e30049	Drafting the selection to highlight interface	2017-11-06 22:47:07 -08:00
Olivier Prat	e9743d4c95	Added jsdoc to SelectionScriptingInterface	2017-11-02 10:00:30 +01:00
Olivier Prat	f2444f9a30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-02 09:25:07 +01:00
Ryan Downe Karpf	28a99fe685	Merge pull request #11655 from dback2/tabletcontextualmode ... add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place	2017-10-30 08:56:26 -07:00
David Back	08a6eb4dd3	reset tablet contextual mode back to false when toggling tablet show/hide	2017-10-24 15:50:09 -07:00