701 commits

Author	SHA1	Message	Date
hiflex	a4406906f3	Fix the Face Camera checkbox on the text entity properties tab. ... The checkbox appeared unchecked even if the underlying property was true.	2017-05-11 20:12:10 -05:00
Zach Fox	6a33ef49c2	New language for unshareable snaps	2017-05-04 16:17:33 -07:00
Zach Fox	2ad3346697	Are there bugs?	2017-05-04 16:05:20 -07:00
Zach Fox	946c5e7662	Almost finished with not-logged-in and not-shareable	2017-05-04 15:24:51 -07:00
Zach Fox	b08d23924a	Keep hover status of both images in sync	2017-05-04 11:00:13 -07:00
Zach Fox	b01bff061e	Hover lock when uploading	2017-05-04 10:06:52 -07:00
Zach Fox	c7f5115e26	Move help text to above buttons	2017-05-04 10:06:52 -07:00
Seth Alves	ecd690e5e9	Merge pull request #10348 from ctrlaltdavid/21311 ... Don't sort recordings	2017-05-04 09:59:12 -07:00
Zach Fox	c82a07016d	New Preparing text; Better disabled behavior	2017-05-03 11:30:44 -07:00
Zach Fox	09488c4987	Disabled state for share butotns	2017-05-03 11:02:44 -07:00
Zach Fox	ff3a76f716	No magic numbers!	2017-05-02 18:23:15 -07:00
Zach Fox	aa46534b60	Whoops.	2017-05-02 17:10:57 -07:00
Zach Fox	964e79ce14	It's working!	2017-05-02 16:58:33 -07:00
Zach Fox	68fa8e06ef	Super amped about this. Only need to add disabled state?	2017-05-02 16:38:16 -07:00
Zach Fox	5d38cd543d	Yet another checkpoint	2017-05-02 16:06:13 -07:00
Zach Fox	7817c72ea1	Another checkpoint	2017-05-02 15:58:43 -07:00
Zach Fox	0beceae59b	Checkpoint	2017-05-02 15:19:20 -07:00
Zach Fox	1067d1e0f6	Don't let user blast in certain cases	2017-05-02 14:43:16 -07:00
Zach Fox	d8095c5ea5	New setup instructions; new 'blank snapshot' text	2017-05-02 14:20:27 -07:00
Zach Fox	d1dff7606c	Lint cleanup; Immediate share button visibility;	2017-05-02 14:10:24 -07:00
Zach Fox	a754c4d6cc	Still image on top	2017-05-02 10:11:54 -07:00
Zach Fox	0ead9e5a24	Visual fixes; Select only 1 image at a time	2017-05-02 10:11:53 -07:00
Zach Fox	d295b5a69d	ShareBarHeight-= 5px; Remove test call	2017-05-02 10:11:53 -07:00
Zach Fox	5b168301bc	Update some typefaces; Add margins to pics	2017-05-02 10:11:53 -07:00
Zach Fox	ac86c13477	Fix sharing; disable HiFi buttons independently	2017-05-02 10:11:53 -07:00
David Rowe	cb8f75394d	Don't sort recordings	2017-05-02 12:08:39 +12:00
Zach Fox	3f146fca9d	Fix announcement audience; Fix disabled buttons	2017-04-27 15:36:59 -07:00
Zach Fox	4152e44d2c	Click anywhere on the image except the bottom to toggle share buttons	2017-04-27 14:01:08 -07:00
Zach Fox	832e16ef86	Visual tweaks; fix active share buttons; comment out tests	2017-04-27 14:01:07 -07:00
Zach Fox	7297355183	Open ShareBar on P0 by default	2017-04-27 14:01:07 -07:00
Zach Fox	0ac660d4ab	Cleanup	2017-04-27 14:01:07 -07:00
Zach Fox	b6601feb1d	It's 5 already?	2017-04-27 14:01:07 -07:00
Zach Fox	a24a48843f	Checkpoint	2017-04-27 14:01:07 -07:00
Zach Fox	3221214283	New Snap FTUE flow	2017-04-27 14:01:07 -07:00
Zach Fox	92187e2424	Making progress towards file chooser dialog	2017-04-27 14:01:07 -07:00
Zach Fox	8c9cd0fad0	Custom social buttons; better testing functionality	2017-04-27 14:01:07 -07:00
Zach Fox	d461723012	Thanks to Jess, slightly different Tweet language	2017-04-27 14:01:07 -07:00
Zach Fox	d7348aabc8	Quick comment updates	2017-04-27 14:01:07 -07:00
Zach Fox	e1789996fb	Add announcements support	2017-04-27 14:01:06 -07:00
Zach Fox	f838e87f48	Pretty stable...	2017-04-27 14:01:06 -07:00
Zach Fox	7c5de1e60b	Getting closer	2017-04-27 14:01:06 -07:00
Zach Fox	fad470eeea	Checkpoint (this is complicated)	2017-04-27 14:01:06 -07:00
Zach Fox	eaa699bbfd	Wow, it's really coming together!	2017-04-27 14:01:06 -07:00
Zach Fox	880bcf3b1e	Checkpoint	2017-04-27 14:01:06 -07:00
Zach Fox	c08b40b950	Initial sharing code hooked up	2017-04-27 14:01:06 -07:00
Zach Fox	01e78612c7	Soooo much progress today	2017-04-27 14:01:06 -07:00
Zach Fox	16b4af8a9d	Rearchitecture	2017-04-27 14:01:06 -07:00
Zach Fox	2880b22f9f	External share buttons!	2017-04-27 14:01:06 -07:00
Zach Fox	4270086a22	Support 1 and 2 images	2017-04-27 14:01:06 -07:00
Zach Fox	0b4cd41d75	More and more progress!	2017-04-27 14:01:06 -07:00
Zach Fox	a4f428a6e6	Lots of progress	2017-04-27 14:01:06 -07:00
Zach Fox	7acdc86644	Progress	2017-04-27 14:01:05 -07:00
Zach Fox	0860352caa	Checkpoint before switching to crash duty	2017-04-27 14:01:05 -07:00
David Rowe	9c7353deb2	Make record script able to be put on the marketplace	2017-04-27 11:22:25 +12:00
David Rowe	4581b9a0df	Refresh countdown number upon reopening dialog	2017-04-26 20:13:21 +12:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
David Rowe	c0a258f9b3	Disable "load" button while making a recording	2017-04-25 09:04:26 +12:00
David Rowe	d73fd6e08d	Update AC script URL in info	2017-04-25 07:42:21 +12:00
David Rowe	7fe0ba19b5	Don't display the "Record" button as pressed while recording	2017-04-22 10:05:02 +12:00
David Rowe	ce86ce4530	Red buttons to unload recordings	2017-04-21 19:45:14 +12:00
David Rowe	8060e98bd5	Right-align "i" icon and update info text	2017-04-21 17:46:30 +12:00
David Rowe	d064511121	Rearrange dialog controls	2017-04-21 17:01:29 +12:00
David Rowe	1aa6e20791	Change "Record" button to "Stop" while recording	2017-04-21 16:15:49 +12:00
David Rowe	477237cca2	Red "recording" ring animation with countdown numbers inside	2017-04-21 16:07:50 +12:00
Stephen Birarda	3452dd0251	increment colspan count in table footer	2017-04-20 15:20:48 -07:00
Stephen Birarda	924624b127	add new glyphs with check, reference in entityList	2017-04-20 14:21:13 -07:00
Stephen Birarda	f64efe18c0	add an isBaked column to edit.js	2017-04-20 14:21:13 -07:00
David Rowe	0da4e3e3c4	Display scrollbar in recordings table when needed	2017-04-20 14:19:25 +12:00
David Rowe	2108300272	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
David Rowe	7dcda47f95	Fix recording GIF still displaying when reopen tablet to stop recording	2017-04-16 12:57:37 +12:00
David Rowe	e91cf4a4e8	Use "i" circle for info button	2017-04-15 12:50:00 +12:00
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
David Rowe	f715850766	Display animated GIF while recording	2017-04-14 16:13:45 +12:00
David Rowe	08f4fc2cf9	Remove hover highlight from "x"s	2017-04-14 15:51:59 +12:00
David Rowe	c2d8755b15	Merge branch 'master' into 21249	2017-04-14 15:32:45 +12:00
David Rowe	11a2559df9	Use HiFi glyph for delete "x"s	2017-04-14 15:30:28 +12:00
David Rowe	5f333ee02c	Style "i" button and info text	2017-04-14 15:14:39 +12:00
David Rowe	1d43e5a992	Style overall dialog layout	2017-04-14 15:12:36 +12:00
David Rowe	75e4fb3820	On tablet with option enabled recording ends when open tablet or dialog	2017-04-13 19:28:40 +12:00
David Rowe	8f3789421f	Show "busy" spinner when counting down or recording	2017-04-13 19:23:22 +12:00
David Rowe	ff42715a15	Retain "Record" button's pressed state when close and reopen dialog	2017-04-13 18:41:55 +12:00
David Rowe	b508d6882f	Add checkbox that stops countdown/finishes recording when reopen dialog	2017-04-13 17:59:28 +12:00
David Rowe	84cfe1cb75	Don't close dialog when start recording; press "Record" again to finish	2017-04-13 17:00:35 +12:00
David Rowe	afd82f09c0	Provide instructions on running the AC player script	2017-04-13 15:18:04 +12:00
David Rowe	5ad44b6caf	Display empty rows for unused players	2017-04-13 13:50:26 +12:00
David Rowe	24a68ea685	Report the numnber of free players rather than total number	2017-04-13 13:40:52 +12:00
David Rowe	464bc17491	Column heading for "unload" buttons	2017-04-13 13:40:20 +12: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	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
Faye Li	bbed26c8fa	display all online users	2017-01-19 14:34:28 -08:00
Faye Li	23269c2efb	move refresh button to top bar	2017-01-19 13:41:36 -08:00
Ryan Huffman	c015ac1bd5	Add display of server script status to edit.js	2017-01-19 13:27:44 -08:00
Faye Li	193251eb8d	background	2017-01-19 13:11:35 -08:00
Faye Li	450b94f641	load font	2017-01-19 12:55:06 -08:00
Faye Li	53404caccf	top bar css	2017-01-19 12:15:27 -08:00
Faye Li	10f512306e	successfully polling all online users	2017-01-19 10:58:29 -08:00
Faye Li Si Fi	5ad1cc6f4d	end of day commit	2017-01-18 18:03:16 -08:00
Faye Li Si Fi	75b1eba84e	initial commit for users.html	2017-01-18 16:10:42 -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
David Rowe	a1fe908380	Remove a lingering line of old code	2017-01-17 12:56:56 +13:00
David Rowe	d7ab7316a8	Tidying	2017-01-13 12:28:53 +13:00
David Rowe	6f2386eabd	Fix processing of Clara.io status messages	2017-01-13 11:20:00 +13:00
David Rowe	4dee0efdd3	Use more reliable Clara.io API parameters	2017-01-13 09:12:49 +13:00
David Rowe	d45e6f00cb	Prepare only one download at a time	2017-01-12 22:35:42 +13:00
David Rowe	288c069687	Make cancelling downloads more robust	2017-01-12 22:31:09 +13:00
David Rowe	6e622b3719	Don't request model be centered as work-around for downloads failing	2017-01-12 21:35:24 +13:00
David Rowe	cbe8ce0c19	Improve handling of zip file generation failing	2017-01-12 21:33:32 +13:00
David Rowe	37da800a14	Display Clara model preparation progress	2017-01-12 15:47:41 +13:00
David Rowe	9bdcdf73c1	User must be logged into Clara.io site to download	2017-01-12 09:15:01 +13:00
David Rowe	71d6a5cb1d	Implement model request and download	2017-01-11 21:33:03 +13:00
David Rowe	530b176d09	Replace Clara download button with own	2017-01-11 16:36:18 +13:00
howard-stearns	9709bedca7	checkpoint	2017-01-04 16:55:58 -08:00
David Rowe	3d6fe6efe8	Move Clara download button when displaying on tablet	2016-12-16 14:58:22 +13:00
David Rowe	04aef641c5	Fix auto-downloads not happening after forced log in	2016-12-16 11:45:17 +13:00
David Rowe	a7e0135a6a	Continuously update Clara pages because content can change dynamically	2016-12-16 11:28:34 +13:00
David Rowe	861ce2c27b	Reduce whitespace in Clara categories	2016-12-15 20:33:43 +13:00
David Rowe	eb7b2dbdcf	Improve robustness of navigation footer	2016-12-14 15:07:06 +13:00
David Rowe	2b0529bcea	Inform user if can't do Clara.io download because can't write to ATP	2016-12-14 14:45:33 +13:00
David Rowe	4890e92733	Start at HiFi marketplace page instead of directory page	2016-12-14 00:12:52 +13:00
David Rowe	8195393205	Fix Clara marketplace button appearing on top of navigation footer	2016-12-13 22:54:19 +13:00
David Rowe	20623ebddb	Raise and lower keyboard on password fields	2016-12-13 22:48:17 +13:00
David Rowe	14ecb24986	Remove extra browse history item created by Clara download	2016-12-11 17:43:55 +13:00
David Rowe	c87149cfc2	Tidying	2016-12-10 12:59:01 +13:00
David Rowe	c4c2a95e83	Add "back" button to marketplaces footer	2016-12-08 10:58:37 +13:00
David Rowe	1de2c14fee	Remove e-mail message hyperlink if displaying on tablet	2016-12-07 12:52:53 +13:00
David Rowe	e821ec5593	Inject navigation footer into Clara account createion page	2016-12-07 12:38:16 +13:00
David Rowe	01226b03ef	Improve text and robustness of marketplaces footer	2016-12-07 12:20:43 +13:00
David Rowe	8e30674069	Tidying	2016-12-07 09:28:35 +13:00
David Rowe	d857f943f8	Handle Clara marketplace downloads	2016-12-07 09:16:59 +13:00
David Rowe	b83d5c6275	Inject Clara Web page modifications	2016-12-05 21:34:34 +13:00
David Rowe	f04c493e16	Fix navigation bar and opaqueness of Web page	2016-12-05 17:48:20 +13:00
David Rowe	a75d0b3fe8	Merge branch 'master' into 21089	2016-11-30 14:50:51 +13:00
Zach Fox	20a2d1275a	Bugfixes and GIF uploads workinggit add -A!	2016-11-18 14:39:30 -08:00
Zach Fox	adcbb0b760	Code clarity and potential bugfix	2016-11-18 14:39:30 -08:00
Zach Fox	a81289a0d7	Huge progress today. Buggy behavior with multiple snapshots remains	2016-11-18 14:39:29 -08:00
David Rowe	591db37a21	Fix up navigation footer fonts	2016-11-15 15:09:33 +13:00
David Rowe	e4b8d34080	Add navigation bar to marketplace pages	2016-11-15 14:38:03 +13:00
David Rowe	e7d9f98ca4	Get script injection working in new marketplaces window	2016-11-15 09:23:51 +13:00
David Rowe	1caca601f2	Update user instructions	2016-11-10 20:39:29 +13:00
David Rowe	5eff7c9e15	Merge branch 'master' into 21089	2016-11-10 14:42:21 +13:00
Ryan Huffman	c4f35bf7bf	Fix userData in edit.js sometimes showing wrong value when locked	2016-11-07 11:39:36 -08:00
David Rowe	d33ac21aaa	Merge branch 'master' into 21089	2016-11-08 08:23:10 +13:00
Seth Alves	d0c0cdd82f	polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again	2016-11-02 16:31:34 -07:00
David Rowe	de5e02310b	Provide keyboard in marketplaces window	2016-11-03 09:00:40 +13:00
David Rowe	0c6ed67e3b	Tidying	2016-11-02 00:05:30 +13:00
David Rowe	35448b6c09	Update Clara.io instructions	2016-11-02 00:05:10 +13:00
David Rowe	c6558ebebd	Reinstate "reload" button for entity scripts in entities editor	2016-10-21 11:14:57 +13:00
Anthony J. Thibault	f76dbeeffd	Edit.js now works with new ignoreIK default	2016-10-11 17:12:02 -07:00
David Rowe	ad5d525340	Fix keyboard status when switching between entities editor tabs	2016-09-30 14:13:35 +13:00
David Rowe	5e842843c6	Set alphabetic/numeric keyboard per field entered	2016-09-30 11:54:32 +13:00
David Rowe	e3be34528f	Fix keyboard flickering when select entities ... Fix entities list footer count of selected entities in the process.	2016-09-29 16:53:20 +13:00
David Rowe	8e44096981	Fix last entities properties not scrolling when keyboard raised	2016-09-29 15:59:24 +13:00
David Rowe	b60f649e0a	Scroll HTML window if necessary when raise keyboard	2016-09-28 19:27:16 +13:00
David Rowe	a94d77ee12	Raise and lower keyboard in entities editor	2016-09-28 17:57:53 +13:00
David Rowe	fa0aeb4563	Display render info values only when valid provided	2016-09-13 13:03:47 +12:00
David Rowe	d61e4c5c11	Display textures size in MB	2016-09-13 10:52:19 +12:00
David Rowe	44282499c5	New glyph for "has transparent"	2016-09-10 14:37:09 +12:00
David Rowe	a06f49f791	Fix footer entities count not being updated when change filter value	2016-09-10 11:14:23 +12:00
David Rowe	28cfca993f	Add and wire up "search in view" JavaScript API stub	2016-09-08 14:58:48 +12:00
David Rowe	a4b5f5395d	Add "in view" button	2016-09-08 12:56:41 +12:00
David Rowe	db30e36b3b	Implement expand/collapse action to show/hide table columns	2016-09-07 19:11:53 +12:00
David Rowe	b372f82f78	Ensure that the expand/collapse icon is always visible	2016-09-07 17:09:56 +12:00
David Rowe	dba3efd857	Add expand/collapse extra info toggle icon to entities table header	2016-09-07 15:04:27 +12:00
David Rowe	156866f835	Fix "has script" entities list icon	2016-09-07 11:12:04 +12:00
David Rowe	83593087b6	Resize table headers after filter value changed	2016-09-07 11:08:06 +12:00
David Rowe	f83599f855	Merge branch 'master' into 21040	2016-09-07 10:08:51 +12:00
elisa-lj11	bebf9c5890	Added error feature when user tries to download a non fbx file	2016-08-31 17:46:35 -07:00
elisa-lj11	aceddb0cf8	merge with james repo	2016-08-30 15:07:01 -07:00
elisa-lj11	fa941e4a1b	Merge remote-tracking branch 'origin' into marketplaces_html	2016-08-30 10:42:56 -07:00
elisa-lj11	f2e61aa504	added status bar to marketplace	2016-08-29 18:43:32 -07:00
James B. Pollack	2b2b2ecbac	caps	2016-08-29 17:44:33 -07:00
James B. Pollack	d3aad53e0e	cleanup	2016-08-29 17:43:32 -07:00
James B. Pollack	2a12f2feae	marketplaces html	2016-08-29 17:27:39 -07:00
James B. Pollack	95c627aa71	dev	2016-08-29 14:24:36 -07:00
David Rowe	06f0e76647	Merge branch 'master' into 21040	2016-08-27 14:31:28 +12:00
James B. Pollack	264176dac6	css	2016-08-26 14:21:32 -07:00
James B. Pollack	382cbd0a73	start	2016-08-26 14:16:37 -07:00
David Rowe	a0691a581c	Fix sense of column sort order indicators	2016-08-26 18:18:52 +12:00
David Rowe	f55d1f7ce7	Make new columns sortable	2016-08-26 17:56:23 +12:00
David Rowe	6de335e1b1	Column heading text and glyphs	2016-08-26 17:24:25 +12:00
David Rowe	1147adae78	Add columns in entity list for render performance information	2016-08-26 15:16:23 +12:00
James B. Pollack	ee190db5eb	some comments	2016-08-25 16:27:58 -07:00
James B. Pollack	9be073cc12	handle some more cases	2016-08-25 16:03:12 -07:00
Anthony J. Thibault	c2af948e25	Merge branch 'master' into feature/handheld-marketplace	2016-08-24 16:07:04 -07:00
Ryan Huffman	4897d721c3	Merge pull request #8505 from imgntn/json_editor ... New Editor for UserData JSON	2016-08-24 15:49:32 -07:00
James B. Pollack	af2fb5d7ed	beautify more html	2016-08-24 14:54:00 -07:00
James B. Pollack	5305ec7feb	html beautify	2016-08-24 14:51:15 -07:00
James B. Pollack	384c3dd543	cleanup and handle a bug when changing from normal text userdata to another field	2016-08-24 14:49:41 -07:00
James B. Pollack	2f4617cd5e	quiet some prints	2016-08-23 18:20:33 -07:00
James B. Pollack	a5054487ba	save on no selections, select another entity, etc	2016-08-23 18:18:43 -07:00
James B. Pollack	3abbc98857	save when focus on inputs	2016-08-23 15:48:04 -07:00
James B. Pollack	477ed88284	remove autosave, disable save button until change	2016-08-23 14:34:28 -07:00
James B. Pollack	5166a33370	autosave after 1.5 s no changes	2016-08-23 11:53:20 -07:00
Anthony J. Thibault	d607abc8f7	Add dpi to edit.js ... Also, cap the maximum webEntity texture size to 4096	2016-08-23 10:10:27 -07:00
James B. Pollack	6ec429fa0b	remove unused event listeners	2016-08-23 00:19:03 -07:00
James B. Pollack	d9a39553bd	style edits and saved message	2016-08-23 00:14:53 -07:00
James B. Pollack	d0a25e7783	fix switching entities	2016-08-22 23:51:35 -07:00
James B. Pollack	e2a6c08f19	cleanup prints	2016-08-22 17:44:22 -07:00
James B. Pollack	4b61cc9f5f	new user data editor	2016-08-22 17:30:08 -07:00
howard-stearns	bc90b0bc43	pr review	2016-08-22 16:09:09 -07:00
howard-stearns	fc906df5f6	separate into three files	2016-08-22 15:04:38 -07:00
howard-stearns	989974738a	dead code removal	2016-08-22 12:50:51 -07:00
David Rowe	80ee864143	Add icon to "Share in Feed" button	2016-08-20 18:17:49 +12:00
David Rowe	8d88726dba	Fix spacing above image when single column	2016-08-20 13:57:00 +12:00
David Rowe	a94c24e6df	Text and controls	2016-08-20 13:44:47 +12:00
David Rowe	6a9f221a9e	Snapshot image border	2016-08-20 11:36:53 +12:00
David Rowe	3d2afaac77	Size and position snapshot dialog content blocks	2016-08-20 11:19:30 +12:00
howard-stearns	a3d64dbd9c	code cleanup	2016-08-19 14:14:31 -07:00
howard-stearns	5e8722ccf5	persist "open feed after" checkbox setting	2016-08-18 12:58:00 -07:00
howard-stearns	8823f48666	new snapshot review behavior	2016-08-17 10:00:20 -07:00
howard-stearns	afe376a0a2	fix breakage I made to snapshot uploading	2016-08-12 14:08:50 -07:00
howard-stearns	1b62332058	don't show checkboxes on confirmation dialog when there's only one picture	2016-08-12 11:50:11 -07:00
howard-stearns	ae9af88db2	Spacing and better size for HMD pictures.	2016-08-12 11:28:35 -07:00
David Kelly	3408ad6f54	Wording change	2016-08-12 10:23:33 -07:00
David Kelly	e23e9014c6	Merge remote-tracking branch 'upstream/discovery' into dk/gateSnapshotShares	2016-08-12 10:16:27 -07:00
howard-stearns	e3aae0e93f	Fix up layout, and adapt to recent changes in file structure	2016-08-11 16:23:01 -07:00
howard-stearns	e6746acf4c	Merge branch 'master' of https://github.com/highfidelity/hifi into discovery	2016-08-11 15:40:26 -07:00
David Kelly	c1edd008a4	PR feedback	2016-08-11 11:47:55 -07:00
David Kelly	47dea0ea2b	Hide sharing if not logged in, or in an accessible place ... The grand future will have option to login, and so on...	2016-08-10 17:09:43 -07:00
howard-stearns	5715fd00f3	proper share dialog	2016-08-09 16:42:41 -07:00
Zach Pomerantz	d5b822ddbe	remove missing camera selectors	2016-08-09 15:23:36 -07:00
Zach Pomerantz	6965fb0520	refactor system html to split js/css	2016-08-09 15:23:31 -07:00
James B. Pollack	bde46adee8	update description	2016-08-08 11:31:43 -07:00
James B. Pollack	f8c1d8f123	change property order and cleanup	2016-08-08 11:01:03 -07:00
Brad Davis	03cb6175ab	Support triangle and hexagon shapes, add shape support to overlays.	2016-07-15 22:02:17 -07:00
Andrew Meadows	76cb80112e	support new shape types in edit.js	2016-07-06 10:51:43 -07:00
Andrew Meadows	f41fb30ace	add "Static Mesh" option to edit.js	2016-06-20 17:29:20 -07:00
Brad Hefta-Gaub	852eda3101	Merge pull request #8066 from imgntn/faceCameraText ... Add face camera option to edit.js text entity properties	2016-06-17 14:14:06 -07:00
James B. Pollack	96d6cb12ac	supress some messages and errors	2016-06-16 12:27:03 -07:00
James B. Pollack	3b2e0842b0	add face camera to text properties	2016-06-13 23:27:08 -07:00
James B. Pollack	188590a891	cleanup	2016-06-13 13:08:22 -07:00
James B. Pollack	567118f4a9	cleanup	2016-06-13 13:08:12 -07:00
James B. Pollack	342fc07d29	select active element in edit.js after change	2016-06-13 13:06:56 -07:00
Brad Hefta-Gaub	0ec7eae58c	fix shapes to property polymorph and persist	2016-05-27 16:59:42 -07:00
Brad Hefta-Gaub	b8b39b962d	Merge pull request #7868 from jherico/entity_shape ... Add a generic shape primitive	2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub	49ded9c4df	Merge pull request #7873 from ctrlaltdavid/20917 ... restyle file browser	2016-05-24 08:40:38 -07:00
David Rowe	3391430f0a	Tidy zone flying and ghosting entities editor options ... Move options to top of section from under "skybox" subsection Fix capitalization of labels	2016-05-24 20:28:49 +12:00
David Rowe	504516b627	Merge branch 'master' into 20917	2016-05-24 08:03:54 +12:00
Brad Davis	2c703e963c	More shapes	2016-05-22 19:48:59 -07:00
Brad Davis	cd1e910844	Add a generic shape primitive	2016-05-21 23:46:44 -07:00
Brad Hefta-Gaub	18613908df	Merge pull request #7800 from sethalves/no-fly-zones ... No fly zones	2016-05-20 16:59:55 -07:00
Atlante45	0353e562e4	entityProperties.html handles non object userData	2016-05-20 10:18:32 -07:00
David Rowe	e1d885004f	Fix carat in drop-down boxes	2016-05-18 13:59:13 +12:00
David Rowe	17d41dd7b9	HiFi glyphs font file update with fixed up/down carats ... Update QML and HTML spinboxes accordingly.	2016-05-18 13:25:11 +12:00
Seth Alves	0fe4e42511	added zone properties to allow flying/ghosting or not	2016-05-01 13:53:44 -07:00
James B. Pollack	795d866da9	re add locking/visibility tools to edit.js	2016-04-28 13:29:54 -07:00
James B. Pollack	06171f6063	move default to system	2016-04-26 14:47:02 -07:00