57391 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Olivier Prat	0f60cca617	Merged cleaned up fader branch from Sam	2017-07-12 18:09:17 +02:00
Dante Ruiz	12206cf711	Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes	2017-07-12 16:56:25 +01:00
Ken Cooke	77705c5ffa	Merge pull request #10948 from Tingjin/Tingjin-V1 ... Change AudioDevices.cpp	2017-07-12 08:38:06 -07:00
Sam Gateau	5394ac8672	Cleaning up changes, removing comments and dead code etc...	2017-07-12 17:33:05 +02:00
Olivier Prat	2f9885870b	First merge with Sam's fader branch with custom pipeline support in shape plumber	2017-07-12 17:29:21 +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
Tingjin	80916b62bb	Remove unnecessary code ... Remove two lines of unnecessary code.	2017-07-11 20:52:28 -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
Dante Ruiz	bedd0628b9	allowed tablet to toggle when a dialog is open	2017-07-12 00:51:07 +01: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
Zach Fox	5af5b4516a	Merge pull request #10943 from zfox23/spectatorCamera_removeAvatarEntityWorkaround ... Workaround the bug where Avatar Entities can't get deleted after switching domains	2017-07-11 16:12:21 -07:00
Zach Fox	a27644ae4d	Magic numbers	2017-07-11 15:52:12 -07:00
Zach Fox	51c22eb7db	Also re-enable spectator camera after switching domains	2017-07-11 15:38:10 -07:00
Zach Fox	1001097f92	Fix button state	2017-07-11 15:29:00 -07:00
Zach Fox	b0639be8bd	Use function pointers correctly	2017-07-11 15:23:50 -07:00
Zach Fox	c4a4623ba8	Workaround the bug where Avatar Entities can't get deleted after switching domains	2017-07-11 15:18:08 -07:00
Andrew Meadows	1fe7718b9f	restore wasted byte count when unable to fit stats	2017-07-11 15:02:45 -07:00
Liv	62be0af32d	string pass on Chat.js	2017-07-11 14:57:11 -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	ead461dca7	Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers	2017-07-11 14:25:12 -07:00
Seth Alves	3670a04d8e	switch bare pointers to AudioInjector objects to be QSharedPointers	2017-07-11 14:24:58 -07:00
Andrew Meadows	badbe98097	minor cleanup and constency for packet stats	2017-07-11 14:21:49 -07:00
Seth Alves	d05b353942	Merge pull request #10940 from druiz17/qt-mouse-events ... Fix tablet scrolling for QT 5.9 and QT 5.6	2017-07-11 14:06:53 -07:00
Andrew Meadows	3226d33830	use cached OctreeSendThread::_nodeUuid	2017-07-11 14:02:16 -07:00
Andrew Meadows	15879b2832	+ OctreeSendThread::traverseTreeAndSendContents() ... this abstracts a portion of OctreeSendThread::packetDistributor() which will make it easier to split apart the tree traversal from the sending of packets also cleaned up some of the packet stats tracking	2017-07-11 13:53:08 -07:00
Andrew Meadows	9d111d1f92	remove unused OctreeSendThread::_nodeMissingCount	2017-07-11 13:42:35 -07:00
Dante Ruiz	2f192fd48a	added scroll fix for qt 5.6	2017-07-11 21:19:06 +01:00
Dante Ruiz	01ca192613	fixed tablet scrolling	2017-07-11 21:16:13 +01:00
David Kelly	8fd02c1d0c	Merge pull request #10938 from davidkelly/dk/hmdPreviewFix ... fix hmd preview image	2017-07-11 12:27:18 -07:00
David Kelly	e2426c538e	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/noPreviewAfterDismissing	2017-07-11 11:01:58 -07:00
David Kelly	e1df3feb5c	fix hmd preview	2017-07-11 10:54:35 -07:00
Zach Fox	5bec6cc7f5	Merge pull request #10936 from zfox23/spectatorCamera_activeButtonWhenOn ... Make Spectator Camera icon active when Camera is on	2017-07-11 10:31:29 -07:00
Olivier Prat	7552cca316	First alpha version of bubble collision fade events. Missing a lot of information.	2017-07-11 19:26:15 +02:00
Zach Fox	2e8bd3c9cb	Make Spectator Camera icon active when Camera is on	2017-07-11 10:16:55 -07:00
Andrew Meadows	a5cd11cea7	remove more crufty comments	2017-07-11 10:11:24 -07:00
Andrew Meadows	ca3f0ceecb	remove crufty comments	2017-07-11 10:02:18 -07:00
Andrew Meadows	076ae28bed	one less strand of spaghetti when counting packets	2017-07-11 09:52:39 -07:00
Olivier Prat	381e0c64a8	Working avatar fade in / fade out except that it is also triggered on bubble collisions	2017-07-11 16:43:27 +02:00
Olivier Prat	aba8be595e	Separated fade categories from transition event types	2017-07-11 11:37:24 +02:00