23522 commits

Author	SHA1	Message	Date
Zach Fox	8553277c56	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-12 14:18:50 -07:00
Stephen Birarda	f6d9a79fb5	Revert "Revert "fix for invisible avatars after radius ignore""	2017-07-12 10:36:53 -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
David Kelly	e1df3feb5c	fix hmd preview	2017-07-11 10:54:35 -07: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
David Kelly	1c9c36a8c8	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview	2017-07-10 10:22:31 -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
David Kelly	4843b91f47	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-10 09:50:17 -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	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
Zach Fox	dbb48cd1aa	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-07 16:03:04 -07:00
David Kelly	f18e64ed1a	first pass at blitting correct hmd preview (in mono)	2017-07-07 15:53:29 -07: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
Seth Alves	88c39f3237	off-by-one	2017-07-07 09:15:42 -07: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
Atlante45	0c18f04e58	Fix Audio Mixer crash	2017-07-06 18:41:25 -07:00
Seth Alves	801c45898f	dry up some code	2017-07-06 18:41:11 -07:00
Seth Alves	57ba2c5cd6	add invalidateJointIndicesCache method	2017-07-06 18:16:41 -07:00
Seth Alves	ef4a04b9cf	code style	2017-07-06 18:01:58 -07:00
Seth Alves	ab8d9f4885	check for faux joints before heading into code that needs to lock	2017-07-06 18:00:11 -07:00
Seth Alves	a543b957ef	fix a race	2017-07-06 17:45:57 -07:00
Seth Alves	fc61fcf494	coding style	2017-07-06 17:40:41 -07:00
Seth Alves	15d379cc5a	coding style	2017-07-06 17:36:28 -07:00
Seth Alves	2e88eca2b9	oopsy crazy	2017-07-06 16:33:37 -07:00
Seth Alves	62b7ba6446	Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts	2017-07-06 16:01:42 -07:00
David Kelly	b41c470064	first cut, still stereo	2017-07-06 15:59:24 -07:00
Seth Alves	e03b902a15	change when joint cache is copied	2017-07-06 15:42:24 -07:00
Seth Alves	0ac8f6efa3	cache the jointnames and indexes from FBXGeometry for out-of-thread access	2017-07-06 14:02:59 -07:00
Clément Brisset	34e3f56002	Merge pull request #10843 from birarda/bug/user-activities-interface-only ... disable user activity logger in DS/AC/ac-client	2017-07-06 14:01:49 -07:00
Seth Alves	24c8267030	in Rig joint accessors, if on the Rig's thread use internalPoseSet, else use external	2017-07-06 13:22:14 -07:00
Stephen Birarda	bdcdff3dbc	force _isSet to be set before isSet() called	2017-07-06 12:01:08 -07:00
Seth Alves	e9bdbd7715	Merge branch 'calvin' of github.com:samcake/hifi into faster-getters-on-avatar-for-scripts	2017-07-06 11:09:38 -07:00
Atlante45	1d07ab70f0	Fix warnings	2017-07-06 10:56:09 -07:00
Andrew Meadows	2299bb7718	supply minimum shape rather than null	2017-07-06 10:37:44 -07:00
Stephen Birarda	916f57772b	default the UAL off for all targets, enable manually for Interface	2017-07-06 10:21:07 -07:00
Zach Fox	ee86638c4e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-06 09:58:00 -07:00
David Kelly	1ccf0da7d8	Merge pull request #10897 from davidkelly/dk/cacheSwitchFix ... redo cache switch	2017-07-06 09:53:01 -07:00
Brad Davis	d91516c630	Merge pull request #10894 from jherico/acclient_fix ... Fix ACClient on Linux	2017-07-05 18:26:15 -07:00
Atlante45	9a1d38384d	Remove unecessary loops	2017-07-05 17:43:09 -07:00
Atlante45	20a633eb89	Check struct sizes at compile time	2017-07-05 17:42:59 -07:00