23492 commits

Author	SHA1	Message	Date
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	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
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
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
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
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
David Kelly	4a22fbca1b	redo cache switch	2017-07-05 17:01:31 -07:00
Brad Davis	2409c83d5d	Fix ACClient on Linux	2017-07-05 16:53:42 -07:00
Brad Davis	7f1bc07d04	Trying to fix overlay crashes again	2017-07-05 14:30:01 -07:00
Sam Gateau	48b4b5f49c	Fixing the bug appearing on Nvidia 284.76	2017-07-05 18:39:09 +02:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
Clément Brisset	8744b8e58d	Merge pull request #10859 from Atlante45/fix/ac-cleanup ... Fix AC cleanup	2017-06-30 16:42:15 -07:00
Stephen Birarda	f6fe3f91fd	Merge pull request #10829 from birarda/bug/sequence-skips ... fix avatar mixer sending empty avatar identities	2017-06-30 15:28:29 -07:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	9c37b28ba0	Remove tool window logic	2017-06-30 10:58:19 -07:00
Zach Fox	0f9c917965	Merge pull request #10853 from samcake/brown ... Fix projection & lighting issues identified with 2nd rendering pipeline In Master	2017-06-30 10:05:54 -07:00
Brad Davis	8372d73fec	Additional thread safety	2017-06-30 09:15:06 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
anshuman64	b22daa9a6f	Merge pull request #10838 from druiz17/avatar-recording-roomscale ... Fix loading of incorrect joint data for the avatar recording	2017-06-29 12:24:37 -07:00
Atlante45	5c731636b1	Sandbox restarts crashed processes	2017-06-29 12:13:52 -07:00