55879 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
howard-stearns	07ea2e271b	hook into location changes	2017-05-30 14:59:19 -07: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
Anthony J. Thibault	d4dbd94a35	Compute defaultSpineSplineto defaultPose offset	2017-05-30 14:25:32 -07:00
Anthony J. Thibault	39c23bfe2f	revision of spine spline rotation calculation	2017-05-30 14:25:30 -07:00
Anthony J. Thibault	fc12d7547a	Addition of CubicHermiteSpline helper classes.	2017-05-30 14:25:29 -07:00
David Rowe	d891c834ba	Move record script files to unpublishedScripts directory	2017-05-31 09:06:11 +12:00
Seth Alves	ffe844a8e7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-30 13:42:20 -07:00
Ryan Huffman	4a52f4090d	Merge pull request #10552 from huffman/fix/multiple-nic-lockup ... Fix SendQueue not setting lastReceiverResponse when recv handshake ack	2017-05-30 13:05:01 -07:00
Chris Collins	5db0975554	Merge pull request #10556 from highfidelity/RC-41 ... Beta Release 41 - Includes up to Developer Release 6603	2017-05-30 12:52:30 -07:00
Stephen Birarda	9fa900bac8	Merge pull request #10568 from thoys/fix-doc-headers ... Fix markdown headers	2017-05-30 12:29:27 -07:00
Thijs Wenker	68ad8fa981	visual headers	2017-05-30 21:12:51 +02:00
howard-stearns	fe351f8ea2	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-05-30 12:04:15 -07:00
Stephen Birarda	60125eb1d7	Merge pull request #10567 from highfidelity/openssl-win-installer-update ... OpenSSL installer update	2017-05-30 12:03:20 -07:00
Thijs Wenker	1ea3b2b7f4	let headers be headers	2017-05-30 21:01:42 +02:00
Thijs Wenker	1339516177	OpenSSL installer update	2017-05-30 20:56:45 +02:00
Brad Davis	765bd3890e	Improving test code for KTX library	2017-05-30 10:47:49 -07:00
Stephen Birarda	41716ec56b	Merge pull request #10554 from seefo/master ... Moved audio asset processing to a separate thread	2017-05-30 10:44:53 -07:00
Seth Alves	250e381ea7	Merge pull request #10563 from Atlante45/fix/reset-settings ... Fix "retain avatar info"	2017-05-30 10:00:55 -07:00
Seth Alves	e82e80e8e0	OculusDebugDisplayPlugin is head controller	2017-05-30 09:55:33 -07:00
Vladyslav Stelmakhovskyi	0f80a8b7af	On create button, switch Tablet to landscape mode	2017-05-30 16:51:04 +02:00
David Rowe	8de93d9651	Fix typo noticed in passing	2017-05-30 15:53:58 +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
volansystech	e90b1b5a67	Resolve the comments of @ZappoMan.	2017-05-29 18:21:59 +05:30
volansystech	212627bd5d	Merge branch 'master' into 21255	2017-05-29 17:51:45 +05:30
volansystech	0920dbc1a8	Resolve the comments of @ZappoMan.	2017-05-29 15:53:33 +05:30
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