383 commits

Author	SHA1	Message	Date
Seth Alves	eb049c8c6e	Merge pull request #10624 from misslivirose/feat/add-primitive-shapes ... Add additional primitive shapes	2017-06-09 19:02:54 -07:00
Seth Alves	759a87c27e	Merge pull request #10647 from misslivirose/feat/move-chat-defaultscripts ... Move chat app to run with default scripts	2017-06-08 20:26:34 -07:00
Seth Alves	9fa74029c7	Merge pull request #10633 from mnafees/21299 ... CR for Job #21299 - Save category on Marketplace when using back button	2017-06-08 16:10:56 -07:00
Liv	0e27ad767c	Move chat app to be included as part of the default scripts	2017-06-08 13:07:01 -07:00
seefo	8d5b90afe7	Merge pull request #10600 from seefo/snapshot ... Added Polaroid Feature to Snapshot	2017-06-07 17:05:29 -07:00
seefo	26bd6b67ae	Final touches to polaroid feature	2017-06-07 16:52:16 -07:00
Mohammed Nafees	608becef7d	Make the back button work again, uses the browser history directly now.	2017-06-07 15:52:06 +05:30
Liv Erickson	6e5cb63d4f	Add z-index fix for dropped down list	2017-06-06 09:15:41 -07:00
seefo	b729707ce7	Removed old comments in SnapshotReview.js	2017-06-06 09:10:25 -07:00
Liv	9248715b21	Fixing z-index for Shape drop down	2017-06-05 17:37:32 -07:00
Liv	6cecac36d5	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes	2017-06-05 12:23:23 -07:00
Andrew Meadows	85a1e1d691	Merge pull request #10608 from ctrlaltdavid/21379 ... Fix icon for polylines in entities editor properties page	2017-06-05 11:06:23 -07:00
Clément Brisset	0a864a7ce9	Merge pull request #10570 from ctrlaltdavid/21376 ... Move record script files to unpublishedScripts directory	2017-06-02 16:25:56 -07:00
David Rowe	58c4a2f12a	Fix icon for polylines in entities editor properties page	2017-06-03 06:26:13 +12:00
seefo	655a411865	Cleaned up Polaroid code	2017-06-02 11:02:01 -07:00
seefo	4e190434d1	Added polaroids to snapshots	2017-06-01 16:53:48 -07:00
Zach Fox	53701371ab	Fix some bugs :(	2017-05-31 16:43:21 -07:00
Liv	27d4edd2d0	Add circle and cone to entity shape list	2017-05-31 16:25:11 -07:00
Liv	f594fd6aa5	Merge branch 'feat/add-primitive-shapes' of https://github.com/misslivirose/hifi into feat/add-primitive-shapes	2017-05-31 15:14:04 -07:00
Zach Fox	fd92afff8c	Ensure old snaps don't accidentally get shared for_url	2017-05-31 14:47:07 -07:00
David Rowe	f0c56dac3f	Further files required for record script	2017-06-01 09:09:17 +12:00
Seth Alves	e80704f3c9	Merge pull request #10578 from thoys/fix/grabableDynamic ... Edit.js: Fix hidden dynamic property while clone-able is active	2017-05-31 12:54:36 -07:00
Thijs Wenker	5c5aaf3254	Fix hidden dynamic property whenever the item is clone-able / DRYing propertyUpdates	2017-05-31 20:18:42 +02:00
Zach Fox	0441d8c703	Add placeholder image when previous snapshot can't be loaded	2017-05-31 10:27:17 -07:00
David Rowe	d891c834ba	Move record script files to unpublishedScripts directory	2017-05-31 09:06:11 +12:00
Liv	d3e900e42f	Adding first pass on cone shape	2017-05-25 12:54:49 -07:00
Liv	417d9ec80b	Surface cylinder option for primitive shape to html	2017-05-25 11:04:25 -07:00
Zach Fox	6765451cc8	Ensure snapshots without story_ids get uploaded	2017-05-19 10:36:31 -07:00
Zach Fox	8efac1e7f1	Prevent another GIF from being captured while one is processing	2017-05-18 14:30:08 -07:00
Seth Alves	36f8d08b32	Merge pull request #10450 from hiflex/patch-1 ... Fix the Face Camera checkbox on the text entity properties tab.	2017-05-16 20:31:56 -07:00
Zach Fox	aa0394c2ef	Fix case when user stories would be incorrectly deleted	2017-05-16 11:07:03 -07:00
Zach Fox	d189f3f110	Fix the twitter mention	2017-05-12 12:39:10 -07:00
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