3101 commits

Author	SHA1	Message	Date
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
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 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
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
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07: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
Sam Cake	3eb95d2d19	cleaning the commented code	2017-05-25 01:16:45 -07:00
samcake	044110e4f3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-24 15:40:40 -07:00
samcake	653abf0ee3	brining the new counters to 4.1	2017-05-22 17:34:06 -07:00
samcake	e0487f7e04	Solving the size evaluation for compressed format	2017-05-22 16:51:54 -07:00
samcake	e4f9f2935e	Solving the size evaluation for compressed format	2017-05-22 15:42:18 -07:00
Sam Cake	1f090d8148	Debugging the size problem and fixing the compression size evaluation	2017-05-22 01:00:34 -07:00
samcake	c5b5aa93b1	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-19 18:13:42 -07:00
samcake	c449229850	Cleaned up the counters for memory	2017-05-19 17:52:56 -07:00
Sam Gateau	36ac623e66	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-19 13:25:36 -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
Sam Gateau	d9ad45bf4a	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-18 09:37:04 -07:00
samcake	2c6e10fbe1	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-18 09:21:02 -07:00
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
samcake	b19b0007c8	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-17 13:02:37 -07:00
Seth Alves	3570bd905e	update for spring to tractor name-change	2017-05-17 11:55:23 -07:00
Seth Alves	8a88b30da7	Merge pull request #10468 from AndrewMeadows/cleanup-actions ... cleanup Actions and Constraints part-1	2017-05-17 11:33:53 -07:00
Sam Gateau	0f250e693d	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-17 09:49:20 -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
Brad Hefta-Gaub	36c7821e1e	Merge pull request #10455 from ZappoMan/TriangleSetOptimizations ... TriangleSet optimizations - ~80% improvement in Ray picking against models	2017-05-16 20:47:50 -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
samcake	b466964817	REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior	2017-05-16 18:21:24 -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
Andrew Meadows	d705f529a0	use 'tractor' instead of 'spring' in JS files	2017-05-16 08:35:54 -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