55734 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dante Ruiz	36002e8b92	Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix	2017-06-01 17:01:59 +01:00
Anthony J. Thibault	813feeb8fd	Limit spine spline compression/stretch to 15%	2017-06-01 08:56:42 -07:00
David Kelly	f79c9ea021	we can sort on ignored	2017-06-01 07:29:31 -07:00
David Kelly	a17886aa58	do not allow sorting on non-sortable columns in PAL	2017-06-01 07:24:03 -07:00
Vladyslav Stelmakhovskyi	30ab9771ef	Merge branch 'master' into create_in_landscape	2017-06-01 16:06:15 +02:00
Seth Alves	0b2eb43ee2	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 07:02:31 -07:00
Sam Cake	ea6be93c9c	adding another flavor of the prepare stencil	2017-06-01 01:24:57 -07:00
NeetBhagat	d27ad061cb	Merge branch 'master' into 21255	2017-06-01 12:46:14 +05:30
Sam Cake	07eb1d89e1	fixing the warning on macosx about the non portable file name	2017-05-31 23:59:44 -07:00
NeetBhagat	c7c07b28e9	Resolve the reviewed comments of @ZappoMan	2017-06-01 12:17:13 +05:30
Sam Cake	3c9b14ee94	Oene more fix	2017-05-31 23:26:20 -07:00
Sam Cake	03fdc1396c	Fixing the warnings	2017-05-31 23:20:10 -07:00
Sam Cake	e02115bcda	clearing up the stencil jobs	2017-05-31 23:00:05 -07:00
Sam Cake	0372deebff	Last warnings?	2017-05-31 22:09:30 -07:00
Sam Cake	d19956f93c	Fixing warnings	2017-05-31 22:02:47 -07:00
Sam Cake	b528c2fc60	Merged	2017-05-31 19:33:14 -07:00
Stephen Birarda	1d9d83b157	initial version of the ClosureEventSender using std::thread	2017-05-31 19:00:41 -07:00
Sam Cake	c28584c8f4	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-31 17:06:13 -07:00
Anthony J. Thibault	d3ca34956d	Fix spline interpolation the wrong way when bending backward.	2017-05-31 16:58:17 -07:00
samcake	82d348a2ef	Stencil rejection is working, and more cleaning	2017-05-31 16:46:20 -07:00
Zach Fox	53701371ab	Fix some bugs :(	2017-05-31 16:43:21 -07:00
Dante Ruiz	cca0fa6600	fixed some input recorder design issue	2017-06-01 00:23:37 +01:00
David Kelly	c29091f0b1	Merge pull request #10582 from davidkelly/dk/4996 ... remove extra activity logger call	2017-05-31 15:18:17 -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
Seth Alves	e37387f45c	sync	2017-05-31 14:01:09 -07:00
Brad Davis	a77491ccb1	FileCache refactoring and tests	2017-05-31 13:45:59 -07:00
David Kelly	e1700915f7	remove extra activity logger call	2017-05-31 13:28:57 -07:00
Howard Stearns	b552566bf8	Merge pull request #10580 from manapa01/Default-Discoverability-Mode ... Changed the DEFAULT_DISCOVERABILITY_MODE to Connections	2017-05-31 13:00:15 -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
Zach Fox	8d02a93727	Merge pull request #10576 from zfox23/snapshot_AddErrorImage ... Add placeholder image when previous snapshot can't be loaded	2017-05-31 11:19:32 -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
Patrick Manalich	7b69a5dbd5	Changed the DEFAULT_DISCOVERABILITY_MODE to Connections	2017-05-31 10:46:04 -07:00
Zach Fox	0441d8c703	Add placeholder image when previous snapshot can't be loaded	2017-05-31 10:27:17 -07:00
Seth Alves	7a47250aa7	oops missed a comma	2017-05-31 10:21:10 -07:00
Dante Ruiz	7fcdc61244	add head puck offset preference	2017-05-31 18:20:35 +01:00
samcake	5d32ed8589	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-31 09:35:37 -07:00
Dante Ruiz	f4328af66f	made final requested changes	2017-05-31 17:12:27 +01:00
Vladyslav Stelmakhovskyi	02d9aa2e31	Merge branch 'master' into create_in_landscape	2017-05-31 15:50:23 +02:00
NeetBhagat	58142817a1	Resolve the review comments of @ZappoMan.	2017-05-31 19:18:14 +05:30
Sam Cake	32c5dac66a	Big cleanup of unecessary shaders and legacy from deferred lighting, and messing around with the stencil	2017-05-31 00:55:28 -07:00
Anthony J. Thibault	cff42ab9b0	Working spline spline.	2017-05-30 19:01:52 -07:00
Dante Ruiz	41869430f7	made some changes that were requested	2017-05-31 01:29:32 +01:00
Seth Alves	2ad85c158a	more work on getting head routed through input system	2017-05-30 17:11:56 -07:00
samcake	8559ed6260	Starting to add the stencil mask for hmd	2017-05-30 16:37:10 -07:00
Dante Ruiz	b3401d9762	making some final changes	2017-05-30 23:55:45 +01:00
Dante Ruiz	9c787eb784	removed commented code	2017-05-30 22:59:12 +01:00
Dante Ruiz	a0ba1a64b5	Merge branch 'master' of github.com:highfidelity/hifi into head-puck	2017-05-30 22:52:57 +01:00
Dante Ruiz	4c4811dca8	finished the head puck	2017-05-30 22:52:39 +01:00