23582 commits

Author	SHA1	Message	Date
Andrew Meadows	99aad77e53	Merge pull request #10954 from jherico/qml_crashes_again ... Still trying to address QML crashes	2017-07-17 10:21:23 -07:00
Andrew Meadows	5a4f56388b	Merge pull request #10881 from hyperlogic/feature/smooth-ik-chains ... Smooth IK when trackers are disabled / enabled.	2017-07-14 16:59:30 -07:00
druiz17	3b112450f0	Merge pull request #10959 from druiz17/bug/wrong-tablet-state ... Fix tablet scripting interface setting its internal state to home when switching between toolbar and tablet mode	2017-07-14 14:31:04 -07:00
Seth Alves	806d9f1436	Merge pull request #10968 from druiz17/bug/load-priority ... Prioritize file:// requests over http://	2017-07-14 11:13:35 -07:00
Zach Fox	a9197509d8	Merge pull request #10965 from CainFoool/avatar-scaler ... WL 21422 - Add a scale slider for avatar size	2017-07-14 10:30:33 -07:00
Dante Ruiz	68fa426da9	set file url as higher priority	2017-07-14 18:17:13 +01:00
Anthony J. Thibault	de199bff9d	code review feedback	2017-07-14 09:47:37 -07:00
Brad Hefta-Gaub	b35d696077	Merge pull request #10966 from sethalves/fix-softattachment-crash ... avoid crash in soft-attachment code	2017-07-13 15:48:23 -07:00
Howard Stearns	17fcfad957	Merge pull request #10875 from highfidelity/spectator-camera ... Spectator Camera	2017-07-13 13:57:18 -07:00
Cain Kilgore	f91a8c0f53	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
Seth Alves	12f52e8f20	don't do SoftAttachmentModel::updateClusterMatrices if geometry isn't ready	2017-07-13 13:18:21 -07:00
Andrew Meadows	4f75558b49	Merge pull request #10963 from sethalves/fix-sort-joints ... put result of Avatar::getJointNames back in index-order	2017-07-13 12:44:32 -07:00
Cain Kilgore	521babb6bd	Avatar Scaler - should be PR Ready.	2017-07-13 19:18:51 +01:00
Seth Alves	59d88cb564	Merge pull request #10941 from sethalves/audio-injector-smart-pointers ... Audio injector smart pointers	2017-07-13 11:00:02 -07:00
Sam Gateau	1557b985c4	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2017-07-13 09:30:33 +02:00
Sam Gateau	b065b99b0b	fix linux compilation maybe	2017-07-13 09:30:04 +02:00
Seth Alves	85d0b68284	try again on putting result of Avatar::getJointNames in index order	2017-07-12 20:36:37 -07:00
Seth Alves	44de1dd2be	put result of Avatar::getJointNames back in index-order	2017-07-12 19:25:39 -07:00
David Kelly	4b3cf5ee2e	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreviewFix	2017-07-12 16:50:51 -07:00
David Kelly	88a449c1af	Fixes hmd preview when resizing	2017-07-12 16:49:26 -07:00
Zach Fox	8553277c56	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-12 14:18:50 -07:00
Cain Kilgore	43782a29c7	Avatar Scaler - WIP	2017-07-12 22:04:58 +01:00
Seth Alves	06618e81d0	remove unneeded <>	2017-07-12 13:14:32 -07:00
Dante Ruiz	e07b067d7b	fixed tablet getting in the wrong state	2017-07-12 21:09:54 +01:00
Seth Alves	59ad3d50ec	Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers	2017-07-12 12:45:58 -07:00
Seth Alves	ddf2312dc6	code review	2017-07-12 12:45:52 -07:00
Brad Davis	0e9f8cc103	Still trying to address QML crashes	2017-07-12 11:04:33 -07:00
Stephen Birarda	f6d9a79fb5	Revert "Revert "fix for invisible avatars after radius ignore""	2017-07-12 10:36:53 -07:00
Sam Gateau	5394ac8672	Cleaning up changes, removing comments and dead code etc...	2017-07-12 17:33:05 +02:00
Seth Alves	b556ddc0ef	remove unneeded AudioInjectorPointer constructor	2017-07-12 07:24:19 -07:00
Sam Gateau	49779754ff	Remove unecessary shaders and apply the custom shader pipeline to polyvox	2017-07-12 15:50:06 +02:00
Sam Gateau	258f1654f2	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2017-07-12 14:14:27 +02:00
Sam Gateau	98cc8c0683	Refining the custom shader pipeline design and registration mechanism	2017-07-12 14:13:58 +02:00
Seth Alves	084a989a7a	stopAndDeleteLater is now just stop	2017-07-11 21:21:42 -07:00
Seth Alves	3897ab2723	don't call deleteLater on smartpointered object	2017-07-11 20:16:00 -07:00
Seth Alves	972dc4d1b2	more const ref	2017-07-11 19:56:34 -07:00
Seth Alves	c52e7e180a	use const AudioInjectorPointer& in some places	2017-07-11 19:42:03 -07:00
Seth Alves	81489ea6c4	use QEnableSharedFromThis	2017-07-11 18:44:37 -07:00
Seth Alves	dbd46fc4b8	Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers	2017-07-11 17:48:29 -07:00
Seth Alves	0b2f13dacc	don't use deleteLater on smartpointered object	2017-07-11 17:07:44 -07:00
Seth Alves	59c586bc5d	remove unused code	2017-07-11 16:58:19 -07:00
Seth Alves	3c8c87cff5	i hate you, milkman dan	2017-07-11 16:48:28 -07:00
Zach Fox	d786820670	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-11 16:16:37 -07:00
Andrew Meadows	782155e9ea	Merge pull request #10876 from Atlante45/fix/ac-crash ... Fix AC crash (buffer overflow)	2017-07-11 14:26:08 -07:00
Seth Alves	3670a04d8e	switch bare pointers to AudioInjector objects to be QSharedPointers	2017-07-11 14:24:58 -07:00
David Kelly	e1df3feb5c	fix hmd preview	2017-07-11 10:54:35 -07:00
Sam Gateau	1f2f539507	Merge branch 'orange' of https://github.com/samcake/hifi into hobbes	2017-07-11 10:26:26 +02:00
Anthony J. Thibault	b0177c2522	remove comment, it does indeed work	2017-07-10 16:25:37 -07:00
Anthony J. Thibault	1cdc0071f3	Fixed issue with hips and chest not ramping off properly.	2017-07-10 16:17:25 -07:00
Atlante45	c32f4ab0d3	CR	2017-07-10 14:24:53 -07:00