309 commits

Author	SHA1	Message	Date
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	f30dc4b560	Add a "record" button to initiate recording	2017-04-12 15:04:29 +12:00
David Rowe	905560b96d	Remove checkbox and record-on-close functionality	2017-04-12 14:48:15 +12:00
David Rowe	86baf785aa	Add "Load" button	2017-04-11 15:23:09 +12:00
David Rowe	9a9bcaf2ae	Stop button stops playing recording	2017-04-11 09:37:57 +12:00
David Rowe	bd63960876	Add table of recordings currently being played	2017-04-11 07:23:52 +12:00
David Rowe	813a5684e3	Display instruction text only if recording is enabled	2017-04-06 09:22:01 +12:00
David Rowe	b29bfd4bb4	Dialog instructions refer to tablet or window as appropriate	2017-04-05 17:49:13 +12:00
David Rowe	54a0bea8c0	Toolbar icon state and start/stop recording with window closing/opening	2017-04-05 17:48:35 +12:00
David Rowe	a625fd4523	Add dialog with "Enable recording" checkbox	2017-04-05 16:20:04 +12:00
David Rowe	f397adb22a	Reinstate scrollbars to marketplace pages	2017-04-01 11:06:27 +13:00
David Rowe	260309ae24	Remove CSS hack no longer needed	2017-04-01 10:53:46 +13:00
David Rowe	a5c683192b	Improve entity properties scroll handle operation in tablet	2017-03-31 12:26:22 +13:00
David Rowe	9c4414cff6	No custom styling of marketplaces directory scrollbar	2017-03-30 14:38:17 +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	6a3dea030e	Settings link	2017-03-28 15:15:33 +13:00
David Rowe	a6ef592353	Non-scrolling window with images scaled to fit	2017-03-28 14:43:26 +13:00
David Rowe	ead1f00bbf	Title	2017-03-28 09:10:20 +13:00
David Rowe	35305b4476	Make dialog single column with images above controls	2017-03-28 08:55:38 +13:00
David Rowe	d0fc352d3b	Address event bridge being shared with other scripts	2017-03-27 16:07:58 +13:00
David Rowe	aa8a1e1dda	Open snapshot dialog in tablet or window appropriately	2017-03-27 15:04:33 +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
Faye Li	1a46f18aa3	adding export button + hiding jump to selection	2017-03-17 15:56:55 -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
Seth Alves	d6428ee98c	Merge pull request #6 from fayeli/tablet-edit-layout-fix ... fix overlapping issue with the delete button	2017-02-23 17:40:15 -08: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	a19bc31a78	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 10:51:22 -08:00
Faye Li	2388ec65fe	Merge pull request #9659 from fayeli/users-fix ... Tablet Users Fixes	2017-02-15 10:25:06 -08:00
Faye Li	8aae2aa5f0	simpler filter code	2017-02-15 10:23:36 -08:00
Seth Alves	3a23ec86d5	handles etc work better	2017-02-14 13:57:48 -08:00
Faye Li	a57a0435c1	fix overlapping issue with the delete button	2017-02-13 15:13:10 -08:00
Faye Li	f981f21aa4	fix for ozan's domain	2017-02-13 11:47:58 -08:00
Faye Li	27057190ce	display users even if they dont have a domain name	2017-02-13 11:01:37 -08:00
Faye Li	8cc8f2c7fd	highlight current visibility option	2017-02-13 10:51:01 -08:00
Faye Li	6e0d7bb3cf	make visibility settings into a modal for better readability	2017-02-13 10:42:07 -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
Faye Li	65ca0c7e4a	sticky header bar	2017-02-10 17:27:02 -08:00
Faye Li	e28e16ea5e	make drop down text a little bit bigger	2017-02-10 16:56:13 -08:00
Faye Li	0ba934f543	sort online users array alphabetically	2017-02-10 16:39:14 -08:00
Faye Li	8f43ceed9d	filter out yourself from users online list	2017-02-10 16:22:30 -08: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
Faye Li	c24b6e5e5e	missing words	2017-02-01 15:13:52 -08:00
Faye Li	c16a9a955e	display correct username	2017-02-01 14:53:03 -08:00
Faye Li	9a22055c27	initialise the toggle button with correct info	2017-02-01 14:30:16 -08:00
Faye Li	3c3ff908b4	handling the visibility toggle event	2017-02-01 14:22:13 -08:00
Faye Li	6d55b3c82d	visibility toggle drop down	2017-02-01 13:45:17 -08:00
Faye Li	378fdaec8b	the missing commit - fix typo and added user info	2017-02-01 11:27:48 -08:00
Faye Li	3f84e5778c	jump to the selected user	2017-02-01 10:45:18 -08:00
Faye Li	fc1e588588	sending and recieving jump to event	2017-02-01 10:34:54 -08:00
Faye Li	59aea60be0	fill confirmation modal with data of the selected user	2017-01-31 16:16:40 -08:00
Faye Li	fda20694b3	jump to user confimation modal	2017-01-31 15:47:51 -08:00
Faye Li	06d797bb3b	load bootstrao	2017-01-31 14:27:17 -08:00
Faye Li	8e64de26a9	Merge branch 'tablet-ui' into new-users-js	2017-01-30 11:25:58 -08:00
Faye Li	ff1c4995af	removed unused code	2017-01-27 15:44:07 -08:00
Faye Li	8091b0ced4	button style	2017-01-27 13:33:07 -08:00
Faye Li	bf51ba7195	button brings up add/remove friends page	2017-01-27 11:34:38 -08:00
Faye Li	bfbee20f43	display friends	2017-01-27 10:19:20 -08: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
Faye Li	6a4a9bcb32	end of day commit	2017-01-25 17:53:32 -08:00
Faye Li	0a3a0e817e	polling users and displaying user count	2017-01-25 17:36:50 -08:00
Faye Li	b5b781f4a5	tab content switching	2017-01-25 16:59:16 -08:00
Faye Li	5ad522668a	tabs header for everyone and friends	2017-01-25 16:29:25 -08:00
Faye Li	ce0ee610ea	a test on polling friends	2017-01-25 14:32:36 -08:00
Atlante45	f540c94113	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
Faye Li	f02b2ef40a	auto poll users when page loads	2017-01-25 11:59:31 -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
Ryan Downe Karpf	3f151cb3d7	Merge pull request #9483 from Atlante45/fix/rescale ... Fix Edit.js rescale for decimal values	2017-01-23 15:44:10 -08:00
Faye Li Si Fi	f8162970ec	filter out yourself from user list	2017-01-23 15:24:33 -08:00
Atlante45	a1962e274d	Fix rescale for 0.x values	2017-01-23 14:35:16 -08:00
Ryan Huffman	f6d5a59c8a	Fix width of edit.js dropdown to accomodate collision options	2017-01-23 14:18:56 -08:00
Ryan Huffman	d108fabd0b	Update the name of the collision shapes used in edit.js properties ... Update the names to be consistent with what is shown on the add model dialog.	2017-01-23 13:56:48 -08:00
Faye Li Si Fi	afc85a3afe	Don't display users who aren't in a domain	2017-01-20 13:53:09 -08:00
Faye Li	763028dad4	refresh icon	2017-01-19 15:46:02 -08:00
Faye Li	5bc0030c8f	hook up event bridge	2017-01-19 15:24:56 -08:00
Ryan Huffman	7cd19192d9	Remove dead code in entityProperties.js	2017-01-19 15:00:30 -08:00