54962 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Clément Brisset	1658ced671	Merge pull request #10437 from Atlante45/feat/faster-startup ... Use baked default skybox	2017-05-12 11:35:51 -07:00
Dante Ruiz	9a0fd78e41	fixed indentation	2017-05-12 19:34:13 +01:00
Dante Ruiz	026daef842	fixed input recorder crash	2017-05-12 19:26:37 +01:00
Seth Alves	bc6fb182eb	pull out motor action, fix import of slider and cone-twist constraints	2017-05-12 10:32:28 -07:00
Seth Alves	fabcd7e8e0	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-12 10:31:55 -07:00
Seth Alves	4b0e51ca54	Merge pull request #10439 from sethalves/word-align--memorystorage ... fix - avoid crash in glTextureSubImage2D	2017-05-12 10:31:44 -07:00
Dante Ruiz	3f5a13d5a9	Merge branch 'master' of github.com:highfidelity/hifi into puck-lost-tracking	2017-05-12 18:18:10 +01:00
Howard Stearns	63f2a1061a	Merge pull request #10447 from davidkelly/dk/smoothScrollFeed ... animate scroll of partially visible cards	2017-05-12 10:13:49 -07:00
anshuman64	840910b42c	Merge pull request #10446 from druiz17/better-config-handling ... Fixed pucks sorting issue and added debug statements to the calibration process	2017-05-12 10:10:05 -07:00
David Kelly	e9908f2f46	Merge pull request #10444 from davidkelly/dk/differentHeightDesktopHandshakes ... Desktop users of different height can shake hands	2017-05-12 09:54:25 -07:00
Seth Alves	c6131916e1	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-12 09:46:21 -07:00
Seth Alves	b14b0ef403	Merge pull request #10449 from sethalves/fix-overlay-rayintersection-crash ... lock in Overlays::findRayIntersectionInternal	2017-05-11 19:13:43 -07:00
Anthony Thibault	c40e3d6ac9	Merge pull request #10272 from Triplelexx/21292 ... 21292 - Implement a script to hand-raise while in desktop mode	2017-05-11 17:38:27 -07:00
David Kelly	a9716313be	cr feedback -- really good feedback in fact	2017-05-11 17:02:37 -07:00
Seth Alves	e1c805e76f	lock in Overlays::findRayIntersectionInternal	2017-05-11 17:02:00 -07:00
Dante Ruiz	5042d4d312	add print when device changes tracking result	2017-05-12 00:28:31 +01:00
Seth Alves	4aa683363c	back out previous changes, do compressionOptions.setPitchAlignment(4) instead	2017-05-11 16:22:12 -07:00
Andrew Meadows	a43447310d	remove physics dependency from avatars-render lib	2017-05-11 15:22:22 -07:00
Dante Ruiz	66020cf446	Merge branch 'master' of github.com:highfidelity/hifi into puck-lost-tracking	2017-05-11 23:19:03 +01:00
Zach Fox	9289cd2022	Merge pull request #10398 from zfox23/PAL_FixIDPacketOrder ... Fix the PAL not showing user info for user who opened PAL	2017-05-11 15:16:05 -07:00
David Kelly	ae5f9e4fb1	animate scroll of partially visible cards	2017-05-11 15:10:19 -07:00
Dante Ruiz	539aaf8c59	add debug statment and fixed sorting order	2017-05-11 23:00:41 +01:00
Andrew Meadows	04827c3a2a	use const auto& where appropritate	2017-05-11 14:51:52 -07:00
Andrew Meadows	f4df223d23	cleanup Head::simulation() code	2017-05-11 14:46:00 -07:00
Atlante45	6378b96b4c	CR	2017-05-11 14:41:02 -07:00
David Kelly	52c288bfed	Desktop users of different height can shake hands	2017-05-11 14:20:42 -07:00
Seth Alves	ac2bc39a27	try, try again	2017-05-11 14:10:03 -07:00
Atlante45	9138ec53e9	Don't send avatars to previous lookup on server restart	2017-05-11 14:07:36 -07:00
druiz17	e4df4369ad	Merge pull request #10436 from druiz17/config-ui ... Added the ability to choose puck configuration from the general settings	2017-05-11 13:39:05 -07:00
Seth Alves	a26f9c7887	make _size const	2017-05-11 13:36:05 -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	045e93fb95	Code style fixes #2	2017-05-11 21:49:07 +02:00
Dante Ruiz	5d457eaa39	better handling of when lost tracking of pucks	2017-05-11 20:44:08 +01:00
Seth Alves	19401af3e1	Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage	2017-05-11 12:43:05 -07:00
Atlante45	e0863aa50f	Only open files for write if necessary	2017-05-11 11:54:52 -07:00
Zach Fox	15574f509e	Clarifying comments	2017-05-11 11:45:07 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
Anthony J. Thibault	a14fa5dab9	code review feedback	2017-05-11 10:54:15 -07:00
Andrew Meadows	0852852f39	Merge pull request #10443 from ctrlaltdavid/21326-2 ... Fix avatar recording playback mouth not moving	2017-05-11 10:41:41 -07:00
Seth Alves	80e6edda0c	code review	2017-05-11 10:13:15 -07:00
Seth Alves	4042e2bceb	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-11 09:29:30 -07: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
Seth Alves	dfb9fecf17	pad MemoryStorage size to multiple of 4 rather than using a vector of uint32_t -- this gets the same alignment without needs casts	2017-05-11 07:11:40 -07:00
Seth Alves	712386f256	Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage	2017-05-11 06:55:49 -07:00
Vladyslav Stelmakhovskyi	4290eb21ea	Fixed possible crashes/freezes on input audio switch	2017-05-11 15:41:07 +02:00
Vladyslav Stelmakhovskyi	f963233a7b	Merge branch 'master' into audio-source-sync	2017-05-11 15:25:24 +02:00
Vladyslav Stelmakhovskyi	e4d9772bbc	Fixed crashes/freezes on audio switch	2017-05-11 15:20:36 +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
David Rowe	e426d70437	Improve variable name	2017-05-11 18:37:23 +12:00