2513 commits

Author	SHA1	Message	Date
NeetBhagat	967c50ab93	Merge branch 'master' into 4869-Entity-resize-issue	2017-06-05 11:08:51 +05:30
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
manapa01	8e1577d3d3	Merge pull request #10596 from manapa01/Snapshot-Sound ... Snapshot sound	2017-06-02 16:07:05 -07:00
Patrick Manalich	0b2de18e8e	Volume Change	2017-06-02 16:04:03 -07:00
Clément Brisset	5f91d2dcb7	Merge pull request #10569 from ctrlaltdavid/21312 ... Improve positioning of assets when added / imported	2017-06-02 15:45:18 -07:00
Patrick Manalich	a705e722f1	Ctrl-S sound feature added	2017-06-02 10:35:57 -07:00
NeetBhagat	580c2548e9	Initial Commit : ... 1) Resolve a bug when 2 different entity is grabbed in 2 hands. And move your left hand and entity of left hand grow/shrink when you move right/left hand. 2) Resolve right hand-left hand grow-shrink functionality	2017-06-02 23:04:58 +05:30
Patrick Manalich	0c71cf4bda	Edit: Snapshot will make sound when initially clicked	2017-06-02 10:24:27 -07:00
Patrick Manalich	4e61db8263	Snapshot will make sound when initially clicked	2017-06-02 10:24:27 -07:00
David Kelly	70b6236890	Merge pull request #10605 from davidkelly/dk/analyticsForBubble ... Add UserActivity calls for bubble usage	2017-06-02 09:48:15 -07:00
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
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
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
Zach Fox	53701371ab	Fix some bugs :(	2017-05-31 16:43:21 -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
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
Stephen Birarda	6c2758e4ea	fix reference to pending transfer count for progress/stats	2017-05-26 14:37:24 -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
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