2587 commits

Author	SHA1	Message	Date
David Kelly	2feea16063	added comment	2017-06-02 09:47:03 -07:00
David Kelly	4dae77cd9d	make sure we dont log the initial call to onBubbleToggled	2017-06-02 08:45:02 -07:00
Menithal	e76dfe4182	21324: Implementation of last feedback ... - If properties are expanded, the animation wrapper should now use the values - Decimal Values from filled in data now automatically get reduced the 1000th. The fields however will allow one to set smaller values and show it, until the entity is selected again - If particle is locked, keep fields locked.	2017-06-02 06:59:23 +03:00
Brad Davis	9a80a81321	Merge pull request #10565 from vladest/fix_claraio_download_clones ... Make sure that there is only one connection created for web events, s…	2017-06-01 20:42:50 -07:00
Menithal	bdcf9a0070	Merge remote-tracking branch 'upstream/master' into 21324	2017-06-02 06:39:55 +03:00
seefo	4e190434d1	Added polaroids to snapshots	2017-06-01 16:53:48 -07:00
David Kelly	37b738ff8b	initial cut at some UserActivities for the bubble	2017-06-01 16:46:31 -07:00
Zach Fox	4e929f6d92	Merge pull request #10581 from zfox23/snapshot_fixForUrlShare ... Snapshots: Fix incorrect "for_url" share; ensure old snapshots don't get shared when they shouldn't	2017-06-01 11:51:14 -07:00
Vladyslav Stelmakhovskyi	b0e4b752d5	Implements landscape mode for tablet as rotation instead of stretching	2017-06-01 19:07:17 +02:00
Vladyslav Stelmakhovskyi	30ab9771ef	Merge branch 'master' into create_in_landscape	2017-06-01 16:06:15 +02: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	70fdb4a168	Fix incorrectly sharing old snapshots	2017-05-31 14:47:07 -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
David Kelly	e1700915f7	remove extra activity logger call	2017-05-31 13:28:57 -07: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
Vladyslav Stelmakhovskyi	0f80a8b7af	On create button, switch Tablet to landscape mode	2017-05-30 16:51:04 +02:00
David Rowe	f5066aac51	Don't adjust position of imported entities of particular types	2017-05-30 15:53:03 +12:00
David Rowe	1e8698aee1	Snap imported JSON to grid	2017-05-30 15:23:18 +12:00
David Rowe	e02021bddf	Tidying	2017-05-30 14:38:59 +12:00
David Rowe	b176dbe544	Refactoring	2017-05-30 14:35:59 +12:00
David Rowe	4c0296daaa	Reposition imported JSON entities so that they start at import distance	2017-05-30 14:29:10 +12:00
David Rowe	18558dd795	Make JSON import distance 2m	2017-05-30 13:34:17 +12:00
David Rowe	31df18ff5b	Fix snap-to-grid elevation	2017-05-29 18:43:49 +12:00
David Rowe	6c890d90ef	Adjust position of model after its been resized	2017-05-29 17:48:01 +12:00
David Rowe	f0785cd39e	Adjust creation position so that bounding box is creation distance away	2017-05-29 13:52:36 +12:00
David Rowe	9b679325ff	Don't raise creation position if in independent or entity view mode	2017-05-29 13:35:54 +12:00
David Rowe	508dee4580	Increase entity creation distance to 2m	2017-05-29 13:35:18 +12:00
Vladyslav Stelmakhovskyi	bcee25acc7	Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated	2017-05-28 19:54:41 +02:00
Menithal	0e46c11a94	Fixed not being able to override slider sizes	2017-05-28 11:59:30 +03:00
David Rowe	367b3ec603	Handle nonvertical avatar orientation	2017-05-28 09:59:32 +12:00
Menithal	4e97f8ad9c	Removed stray print	2017-05-27 16:21:25 +03:00
Menithal	26389be826	Minor tweaks to unselect behavior	2017-05-27 11:18:29 +03:00
Menithal	9201af96bd	Added Changes from Alan's Feedback	2017-05-27 11:02:01 +03:00
Menithal	5500f8240d	Merge remote-tracking branch 'upstream/master' into 21324	2017-05-27 09:55:56 +03:00
David Rowe	2a88f5cc79	Merge branch 'master' into 21345	2017-05-27 11:51:29 +12:00
Stephen Birarda	6c2758e4ea	fix reference to pending transfer count for progress/stats	2017-05-26 14:37:24 -07:00
Liv	06a5467b50	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes	2017-05-26 09:10:50 -07:00
David Rowe	de4184e9fa	Merge branch 'master' into 21345	2017-05-26 15:49:47 +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
Seth Alves	de40604042	whitespace	2017-05-25 09:54:40 -07:00
Seth Alves	80e641b6d4	fix code that was using old raypickInfo.properties field	2017-05-25 09:47:02 -07:00
David Rowe	f1dca5019a	Fix making the tablet horizontal	2017-05-25 11:48:28 +12:00
David Rowe	6452e92ac9	Hand controller data may not be valid	2017-05-25 11:28:26 +12:00
David Rowe	925cca97db	Make the tablet horizontal	2017-05-25 09:16:17 +12:00
Menithal	a3fc87fb23	Removed straggling print	2017-05-24 21:27:47 +03:00
Menithal	3f9b306c7f	Finalized UI changes doing final tests	2017-05-24 21:23:30 +03:00
Menithal	255540d0f8	Reverted a few files	2017-05-24 10:16:46 +03:00
Menithal	674f1f5f3a	Trying to hunt down a specific issue	2017-05-24 09:53:01 +03:00
David Rowe	39654779fb	Position tablet relative to hand	2017-05-24 13:35:00 +12:00
Menithal	9aa7e2e56d	Adjusted values	2017-05-23 02:19:52 +03:00
Menithal	46acbe1aba	Fixed typo	2017-05-22 11:27:32 +03:00
Menithal	d5b7a4e36b	Doing some one-way binding for now. ... - Oddly, there is still an issue with the webview occasionally not appearing when a particle is selected, and appearing inthe wrong time. Investigate.	2017-05-22 02:45:24 +03:00
Menithal	b8695e2509	Returned undescore, is smaller overally actually	2017-05-22 01:14:51 +03:00
Menithal	c6a22bcfa3	Majority of the Bindings complete	2017-05-21 20:49:07 +03:00
Menithal	4269fcf69c	Lots of Groundwork for UI Building ... - Changed underscore to lodash for smaller file size / faster loading - Removed dat.gui dependency, as we now have a completely custom solution - Started to use some more modern convensions which Qt Supports	2017-05-21 19:42:14 +03:00
Menithal	42bb5fa8e9	Part. Tab now only appears if selected ... - Particle Tab now only appears if a Particle Entity is selected	2017-05-20 13:47:24 +03: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
Thijs Wenker	2d6c6af37f	Merge pull request #10381 from Triplelexx/21297 ... DNM 21297 - Edit.js: Make the default particle system attractive	2017-05-17 15:55:40 +02:00
Triplelexx	c678fd67ed	change default particle texture to production	2017-05-17 14:52:11 +01:00
Brad Hefta-Gaub	b0d2de7bc0	Merge pull request #10427 from ctrlaltdavid/21334 ... Fix erroneous "did not start playing recording" messages	2017-05-16 20:54:27 -07:00
Brad Hefta-Gaub	b759a148f3	Merge pull request #10480 from ctrlaltdavid/21360 ... Add domain to record script user activity logging	2017-05-16 20:48:27 -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
David Rowe	04fcdfc4a2	Add domain to record script user activity logging	2017-05-17 12:23:53 +12:00
Triplelexx	5a742002e2	change default particle values	2017-05-16 23:39:38 +01:00
Zach Fox	aa0394c2ef	Fix case when user stories would be incorrectly deleted	2017-05-16 11:07:03 -07:00
David Rowe	0cd5fe35da	Lint	2017-05-16 15:54:55 +12:00
David Rowe	8ab261d1b0	Work around Script.clearTimeout() occasionally failing	2017-05-16 15:52:34 +12:00
David Rowe	4b175e98e9	Delete persistence entity if recording fails to load for manual playback	2017-05-16 15:30:30 +12:00
David Rowe	6d9bf2b33e	Typos	2017-05-16 13:58:42 +12:00
David Rowe	6bdd498ecf	Cancel autoplay when manually playing	2017-05-16 10:47:52 +12:00
David Rowe	5c5eb298f5	Better error message	2017-05-16 09:20:58 +12:00
David Rowe	8480a8e7d5	Merge branch 'master' into 21334	2017-05-16 08:52:31 +12:00
Philip Rosedale	6e82343b29	Merge pull request #10406 from amvmoody/21289 ... 21289 - Edit: Add the ability to duplicate an object with hand controller	2017-05-13 20:43:52 -07:00
Zach Fox	d189f3f110	Fix the twitter mention	2017-05-12 12:39:10 -07:00
David Rowe	2bed69cfea	Display playback errors only for user that initiated playback	2017-05-12 15:18:25 +12:00
David Rowe	acd71caae2	Inform user when an AC error prevents a recording from playing	2017-05-12 14:53:38 +12:00
David Rowe	42aacb07ff	Remove check that recording has started playing	2017-05-12 14:14:24 +12:00
David Rowe	26672b475f	Clear timer value when timer stopped	2017-05-12 14:13:32 +12: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
David Rowe	d7a4396daa	Improve log messages	2017-05-12 11:45:11 +12:00
David Rowe	f74e29e4b0	Code review	2017-05-12 11:43:12 +12:00
David Rowe	021c3dff32	Merge branch 'master' into 21334	2017-05-12 10:34:16 +12:00
David Kelly	52c288bfed	Desktop users of different height can shake hands	2017-05-11 14:20:42 -07:00
Seth Alves	9d63113e62	Merge pull request #10337 from vladest/audio-source-sync ... Audio source sync	2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
David Kelly	0ea5bf7834	Merge pull request #10440 from davidkelly/dk/fixSettingsDialog ... Fix for multiple settings dialogs	2017-05-11 08:11:16 -07:00
Vladyslav Stelmakhovskyi	f963233a7b	Merge branch 'master' into audio-source-sync	2017-05-11 15:25:24 +02:00
Thijs Wenker	0a3a2705af	Merge pull request #10426 from huffman/fix/tablet-invisible-by-default ... Fix tablet showing up for a short period of time on launch	2017-05-11 15:03:52 +02:00
Mike Moody	89d93ee56d	Updated HMD grab Clone to work with all entity types.	2017-05-11 04:16:22 -07:00
Philip Rosedale	f9567d0330	Merge pull request #10182 from CraftsmanMG/master ... hifi: #21216 - Resize entities with hand controllers while editing	2017-05-10 22:03:35 -07:00
David Kelly	4cc0aaf102	Fix for multiple settings dialogs	2017-05-10 18:31:57 -07:00
Triplelexx	7edda87330	change default particle to wispy smoke	2017-05-11 01:21:42 +01:00