55182 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrew Meadows	10d058af02	remove unused parameters from ObjectConstraintConeTwist	2017-05-12 12:07:34 -07:00
Andrew Meadows	18b1bb8b7f	remove unused parameters from ObjectConstraintHinge	2017-05-12 12:04:08 -07:00
Dante Ruiz	6155d31513	removed debug statment	2017-05-12 19:48:31 +01:00
Dante Ruiz	1f328cc923	made requested changes	2017-05-12 19:46:12 +01:00
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	9646569630	back out previous changes, do compressionOptions.setPitchAlignment(4) instead	2017-05-12 10:34:42 -07:00
Seth Alves	3585edaa64	try, try again	2017-05-12 10:34:33 -07:00
Seth Alves	351ddc3b2a	make _size const	2017-05-12 10:34:24 -07:00
Seth Alves	0915c9ad9e	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-12 10:34:08 -07:00
Seth Alves	757b3be03e	force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D	2017-05-12 10:33:48 -07: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
David Rowe	2bed69cfea	Display playback errors only for user that initiated playback	2017-05-12 15:18:25 +12:00
David Rowe	acd71caae2	Inform user when an AC error prevents a recording from playing	2017-05-12 14:53:38 +12:00
David Rowe	42aacb07ff	Remove check that recording has started playing	2017-05-12 14:14:24 +12: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
David Rowe	26672b475f	Clear timer value when timer stopped	2017-05-12 14:13:32 +12:00
hiflex	a4406906f3	Fix the Face Camera checkbox on the text entity properties tab. ... The checkbox appeared unchecked even if the underlying property was true.	2017-05-11 20:12:10 -05: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
David Rowe	d7a4396daa	Improve log messages	2017-05-12 11:45:11 +12:00
David Rowe	f74e29e4b0	Code review	2017-05-12 11:43:12 +12: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
David Rowe	021c3dff32	Merge branch 'master' into 21334	2017-05-12 10:34:16 +12: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