23533 commits

Author	SHA1	Message	Date
Andrew Meadows	fe79514b08	lock when changing EntityTree elements	2017-07-13 13:30:57 -07:00
Andrew Meadows	a0c6c49360	bump some "debug" messages to "warning" status	2017-07-13 13:30:57 -07:00
Andrew Meadows	39e5259e03	remove unused variable	2017-07-13 13:30:57 -07:00
Andrew Meadows	7ea1e7285f	map EntityItemID to EntityItemPointer	2017-07-13 13:30:57 -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
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
Seth Alves	06618e81d0	remove unneeded <>	2017-07-12 13:14:32 -07: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
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
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
Sam Gateau	1f2f539507	Merge branch 'orange' of https://github.com/samcake/hifi into hobbes	2017-07-11 10:26:26 +02:00
Atlante45	c32f4ab0d3	CR	2017-07-10 14:24:53 -07:00
Seth Alves	9b5dfc8d3a	Merge pull request #10929 from druiz17/luanch-crash-fix ... Fixed crash when launching interface from fresh install	2017-07-10 11:31:59 -07:00
Andrew Meadows	ab6f615f96	Merge pull request #10910 from Atlante45/fix/audio-mixer-crash ... Fix Audio Mixer crash	2017-07-10 09:55:44 -07:00
Dante Ruiz	cc86cda737	Merge branch 'master' of github.com:highfidelity/hifi into luanch-crash-fix	2017-07-10 17:49:20 +01:00
Dante Ruiz	75e1b265d5	comment out code that causes a crash on launch from fresh install	2017-07-10 17:48:53 +01:00
Andrew Meadows	96b88dccd7	Merge pull request #10913 from samcake/orange ... Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model	2017-07-10 09:46:09 -07:00
Sam Gateau	746812ff78	Merging with origin orange	2017-07-10 17:25:13 +02:00
Sam Gateau	0c3755483b	adding assert or checks whenever getting a scene stage	2017-07-10 12:37:26 +02:00
Sam Gateau	4edea433ce	Rename the _pipeline into _shapePipeline in the render::Args	2017-07-10 12:16:53 +02:00
Seth Alves	01b612fd14	Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts	2017-07-07 10:42:12 -07:00
Seth Alves	6782a891d0	rename the joint-name caches in AvatarData and Avatar so it's more clear that they are different	2017-07-07 10:35:45 -07:00
Andrew Meadows	2349057306	Merge pull request #10879 from AndrewMeadows/avoid-null-shape ... fix crash in ObjectMotionState::handleEasyChanges()	2017-07-07 10:22:05 -07:00
Sam Gateau	c3dd25e499	Drafting the mechanism to add shape pipeline	2017-07-07 18:26:10 +02:00
Seth Alves	88c39f3237	off-by-one	2017-07-07 09:15:42 -07:00
Sam Gateau	d15c4ea2d3	Merging with the stage branch	2017-07-07 15:12:40 +02:00
Sam Gateau	a8086764da	REmoving warnings for unused var	2017-07-07 12:19:22 +02:00
Sam Gateau	4c1bf6af47	REmoving comments	2017-07-07 11:38:25 +02:00
Sam Gateau	156c20d01e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-07-07 10:58:05 +02:00
Seth Alves	ddabe940d6	dry up some code	2017-07-06 18:42:00 -07:00