143 commits

Author	SHA1	Message	Date
Zach Fox	b410399a16	Resolve your paths, silly!	2017-04-14 16:26:29 -07:00
Zach Fox	f81dce5e70	Fix the bug	2017-04-14 15:42:19 -07:00
Zach Fox	3f91fb8e55	Remove unnecessary comment	2017-04-12 14:45:57 -07:00
Zach Fox	c724c2e50b	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	87b2d5bf8a	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	7b92989b1d	Fix it	2017-04-12 14:45:57 -07:00
Zach Fox	2579ac1baa	It's working!	2017-04-12 14:45:57 -07:00
Zach Fox	e296383b1b	Checkpoint!	2017-04-12 14:45:56 -07:00
David Rowe	f397adb22a	Reinstate scrollbars to marketplace pages	2017-04-01 11:06:27 +13:00
Seth Alves	4516ddf855	Merge pull request #9847 from highfidelity/tablet-ui ... Tablet ui	2017-03-28 14:48:02 -07:00
David Rowe	a6ef592353	Non-scrolling window with images scaled to fit	2017-03-28 14:43:26 +13:00
David Rowe	d0fc352d3b	Address event bridge being shared with other scripts	2017-03-27 16:07:58 +13:00
Anthony J. Thibault	7e6ff7c2fb	Scrollbar is visible on marketplace in toolbar mode.	2017-03-24 11:40:10 -07:00
Anthony J. Thibault	54b11bb6ee	Hide the scrollbar on the marketplace	2017-03-24 11:22:50 -07:00
kunalgosar	f09ee92fe1	spacing issues	2017-03-21 14:16:49 -07:00
kunalgosar	30d2ea0ea5	spacing issues	2017-03-21 14:15:56 -07:00
kunalgosar	a4af973ae4	fixed back button on marketplace	2017-03-21 14:12:54 -07:00
Faye Li	f57905fbb3	remove code for jump to selection	2017-03-20 10:23:55 -07:00
Faye Li	197a06c423	changes in TWO entityList.js to register the export event	2017-03-17 16:17:21 -07:00
Seth Alves	d792559d9a	have edit.js resend properties of selected entity to entityProperties.js once it's ready	2017-03-10 09:59:23 -08:00
Seth Alves	66d44ac6f0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-08 09:26:51 -08:00
Menithal	d85cb645b0	Changed limit logic, default limit is now 0 ... Clones now have a named based on the original entity id Limit is now calculated from the source instance, instead of just clone name to avoid a single box being calculated as something else Default limit is now 0, which disables limit	2017-03-04 11:42:43 +02:00
Seth Alves	3b581a8dfe	merge from upstream	2017-03-02 16:35:44 -08:00
Seth Alves	155a310852	Merge pull request #9761 from Menithal/21166 ... WL#21166 Cloneable Equipment	2017-03-02 16:33:13 -08:00
Menithal	9c31f66b75	Addressed CR of 9684	2017-03-02 21:39:56 +02:00
Menithal	231ebef117	Removed stray debugPrint	2017-03-02 01:01:57 +02:00
Menithal	f538ac24f3	Various Properties	2017-03-01 22:07:02 +02:00
Menithal	1d8be2aeaa	Added missing dynamic	2017-02-26 19:17:46 +02:00
Menithal	10151c3f5b	Added Multi-userdata field updater	2017-02-24 08:04:03 +02:00
Menithal	4d98cc436b	Finished up Edit.js	2017-02-23 23:20:21 +02:00
Menithal	e95e50ad6e	Preliminary work on edit.js to allow for new param	2017-02-23 10:34:04 +02:00
Menithal	9b8503eba5	Initial Grab Clone	2017-02-19 18:18:38 +02:00
Menithal	dcbe3c622d	Added Hotkey Listening to the webview ... Ctrl + P and Ctrl + Shift + P are now available even if the edit window has been selected	2017-02-18 11:51:19 +02:00
Menithal	f5d266a562	Updated	2017-02-17 23:28:28 +02:00
Seth Alves	12b8a77488	in edit.js, convert entity property ID to be a text-field so the data can be copied	2017-02-15 16:29:50 -08:00
Seth Alves	e030a4a518	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 15:20:14 -08:00
David Kelly	5184cbe615	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2	2017-02-15 12:08:55 -07:00
Seth Alves	3a23ec86d5	handles etc work better	2017-02-14 13:57:48 -08:00
humbletim	831bf93500	* refactor ScriptCache per FIXMEs ... * include error details in BatchLoader results * update EntityServerScript properties in edtior to reflect more granular statuses * ScriptEngine plumbing in prep for require/module integration	2017-02-11 04:47:31 -05:00
David Kelly	61e558e568	Entity Edit Filters for zones ... Part 1 - just put them in the zones entities. Next I'll hook them up and actually filter...	2017-02-08 09:53:25 -07:00
Brad Hefta-Gaub	5ada689ab7	Merge pull request #9497 from ctrlaltdavid/fix-clara-download ... Fix intermittent Clara.io download crashes	2017-01-26 10:58:27 -08:00
Atlante45	f540c94113	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
David Rowe	dcd632013f	Better variable name	2017-01-25 16:37:35 +13:00
David Rowe	7e56d0fae6	Fix up Clara.io error handling	2017-01-25 16:36:06 +13:00
David Rowe	1b05ae8a82	Make handling of Clara.io download-ready state transition more robust	2017-01-25 11:00:07 +13:00
Atlante45	a1962e274d	Fix rescale for 0.x values	2017-01-23 14:35:16 -08:00
Ryan Huffman	7cd19192d9	Remove dead code in entityProperties.js	2017-01-19 15:00:30 -08:00
Ryan Huffman	c015ac1bd5	Add display of server script status to edit.js	2017-01-19 13:27:44 -08:00
Ryan Huffman	71e039951c	Add reload server scripts button to edit.js	2017-01-17 14:47:57 -08:00
Ryan Huffman	142c7da523	Add serverScripts property support to edit.js	2017-01-17 14:47:06 -08:00