22223 commits

Author	SHA1	Message	Date
Sam Gateau	59ed51c702	Merge pull request #10280 from samcake/white ... Fixing the crash on mac at start up	2017-04-25 14:32:23 -07:00
Stephen Birarda	c00dfcc7d7	send the domain disconnect packet before UUID is cleared	2017-04-25 14:32:21 -07:00
Brad Hefta-Gaub	1962a49f3b	Merge pull request #10225 from sethalves/bullet-constraints-1 ... Bullet constraints + far-grab bootstrap fix	2017-04-25 13:36:47 -07:00
samcake	fe7cec1734	Testing on windows running 4.1 backend, all good	2017-04-25 12:04:12 -07:00
samcake	dff3a3bb34	fixing the mac crash	2017-04-25 11:34:01 -07:00
Dante Ruiz	8c020a0ec2	saving work	2017-04-25 18:01:19 +01:00
David Rowe	d682924b00	Temporary fix for recording audio	2017-04-25 21:08:10 +12:00
David Rowe	4c30c0d722	Make UserActivityLogger available to AC scripts	2017-04-25 13:42:12 +12:00
David Rowe	c05954ee4b	Add logAction() method to UserActivityLogger JavaScript API	2017-04-25 13:40:57 +12:00
ZappoMan	d179135a87	remove dead code	2017-04-24 18:21:22 -07:00
ZappoMan	95a3e0a092	fix whitespace	2017-04-24 18:06:33 -07:00
ZappoMan	382645ddd0	more cleanup	2017-04-24 18:01:54 -07:00
ZappoMan	aa955ee360	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-24 17:36:30 -07:00
ZappoMan	c9aad6b762	new approach to the tpose fix, as well as other improvements	2017-04-24 17:36:05 -07:00
Anthony J. Thibault	4336e22f5a	clang warning fix	2017-04-24 17:06:02 -07:00
Anthony J. Thibault	937f308ba8	code cleanup	2017-04-24 17:04:16 -07:00
humbletim	28b3eef7aa	add getJointTranslations() methods	2017-04-24 19:22:02 -04:00
Atlante45	24f4107c92	Unload script when replaced with empty URL	2017-04-24 15:56:37 -07:00
Atlante45	d292451f91	Remove unnecessary const	2017-04-24 15:43:36 -07:00
Dante Ruiz	2a997f2a4d	fix for ubuntu build error	2017-04-24 23:08:02 +01:00
Anthony J. Thibault	8adbe34c27	added comment	2017-04-24 14:36:56 -07:00
Anthony J. Thibault	deca26e9eb	Fix for HMDHead tip constraint	2017-04-24 14:33:14 -07:00
Dante Ruiz	8705db07e5	removed dead code	2017-04-24 22:22:49 +01:00
Anthony J. Thibault	1cd0f03242	Restore master version of computeHipsOffset() and special case for HeadHMD target type	2017-04-24 14:19:06 -07:00
Dante Ruiz	249862141a	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-24 22:09:09 +01:00
Dante Ruiz	367a6ac03c	first prototype	2017-04-24 22:09:01 +01:00
Anthony J. Thibault	dc3803a225	Re-enable IK _hipsOffset computation when no hips IK target is present.	2017-04-24 13:59:02 -07:00
Seth Alves	aea8b020d2	Merge pull request #10254 from druiz17/tablet-crash ... Potential fix for crash for TabletScriptingInterface::getTabletWindow	2017-04-24 12:35:04 -07:00
David Rowe	d52125e2f5	Merge branch 'master' into 21249	2017-04-25 07:19:56 +12:00
Dante Ruiz	f69691afd5	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-24 19:57:48 +01:00
Dante Ruiz	d057dfebf0	got input recording to work	2017-04-24 19:57:38 +01:00
Anthony J. Thibault	47e51493e8	dynamicallyAdjustLimits on the underPoses not the relaxed poses.	2017-04-24 09:56:10 -07:00
Sam Gateau	b1a3b1f48b	Merge pull request #10227 from samcake/brown ... Introducing support for the ResourceBuffer binding point in the gpu lib, the Batch and the backends	2017-04-22 08:51:54 -07:00
Seth Alves	17b83dd64c	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-21 17:19:47 -07:00
sam gateau	733e268391	FIx the SSBO usage on amd, needed a bit more explanation on the glsl side	2017-04-21 16:17:18 -07:00
Andrew Meadows	3f9f16cc98	Merge pull request #10223 from kunalgosar/blendshapesbug ... Make setBlendshape changes persist	2017-04-21 16:11:13 -07:00
Dante Ruiz	64fcfd33a4	working on loading files	2017-04-21 22:38:53 +01:00
sam gateau	0a615f35a7	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-21 14:31:15 -07:00
ZappoMan	da68c49dc1	more cleanup	2017-04-21 13:31:40 -07:00
ZappoMan	f07884602a	more CR feedback	2017-04-21 13:13:29 -07:00
ZappoMan	088cdae320	CR feedback	2017-04-21 11:14:47 -07:00
ZappoMan	ff45ad53a3	some more CR cleanup	2017-04-21 10:40:41 -07:00
Dante Ruiz	50ed4a61f7	Merge branch 'master' of github.com:highfidelity/hifi into tablet-crash	2017-04-21 18:26:37 +01:00
Dante Ruiz	8cfa03fa56	tablet cpp ownership	2017-04-21 18:26:26 +01:00
ZappoMan	f133713d0e	CR feedback	2017-04-21 10:21:34 -07:00
ZappoMan	fbc699d6b2	handle overflow case	2017-04-21 09:30:00 -07:00
ZappoMan	c03182546b	some cleanup	2017-04-21 09:11:51 -07:00
Dante Ruiz	641a7390ba	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-21 16:46:55 +01:00
ZappoMan	125b3d5f4e	ignore old identity packets	2017-04-21 07:51:17 -07:00
David Rowe	daedb94b04	Merge branch 'master' into 21249	2017-04-21 14:50:28 +12:00
ZappoMan	c197979354	add more logging	2017-04-20 18:36:00 -07:00
ZappoMan	7f1a87ac4f	remove random http failure	2017-04-20 17:31:20 -07:00
ZappoMan	e89b6c5d2c	some initial debugging on tpose avatars	2017-04-20 17:26:31 -07:00
Sam Gateau	a668ed0409	Merge pull request #10244 from samcake/ambient ... Cleaning the Engine/Task/Job interface	2017-04-20 15:48:21 -07:00
Dante Ruiz	cbd2a532a8	remove debug statments	2017-04-20 23:28:41 +01:00
Dante Ruiz	1ec4081a99	crash fix	2017-04-20 21:38:20 +01:00
Seth Alves	f7378abb08	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-20 02:40:10 -07:00
Zach Fox	50456f71ed	Merge pull request #10142 from Triplelexx/21258 ... 21258 - Don't render (or heavily use GPU) when window in minimized	2017-04-19 16:26:49 -07:00
David Rowe	2108300272	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
Dante Ruiz	b2a11aa9ab	check for null when we dont	2017-04-19 21:30:43 +01:00
Dante Ruiz	d4c8d06575	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-19 20:42:11 +01:00
Dante Ruiz	07f674eabe	exprting compressed file	2017-04-19 20:41:56 +01:00
samcake	7f72efa714	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-04-19 11:51:25 -07:00
Sam Gateau	788849e19a	Merge pull request #10208 from jherico/gl41_variable ... Adding support for variable allocated textures to the GL 4.1 backend	2017-04-19 11:42:23 -07:00
Brad Davis	472835d65c	Port fix from master	2017-04-19 11:22:20 -07:00
Brad Davis	bccc06d2fe	Fix resource texture memory usage tracking	2017-04-19 10:35:19 -07:00
Chris Collins	889b054085	Merge pull request #10067 from humbletim/fix-Entities-setLocalJointTranslations ... Fix Entities.setLocalJointTranslations	2017-04-19 09:32:28 -07:00
druiz17	57f6529ce6	Merge pull request #10239 from druiz17/edit-model ... Fix issue of tablet proxy not choose the correct root	2017-04-19 09:19:46 -07:00
David Rowe	00b6b2a2c0	Implement desktop recordings browser dialog	2017-04-19 12:34:59 +12:00
samcake	5af171f69f	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-04-18 17:08:02 -07:00
samcake	63fe579022	simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead'	2017-04-18 17:05:40 -07:00
Dante Ruiz	1cf9485143	fixed compile issue	2017-04-19 00:23:05 +01:00
Brad Davis	2a2102c7fe	Recompute memory pressure state after each promote / demote call	2017-04-18 15:12:34 -07:00
Dante Ruiz	ce8dba21a0	fix tablet proxy choosing wrong root	2017-04-18 22:49:43 +01:00
Dante Ruiz	5cd4007aaa	got input recording working	2017-04-18 21:53:23 +01:00
kunalgosar	ffdbc12968	copy into new vector	2017-04-18 12:20:03 -07:00
Seth Alves	0807e036e8	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-18 11:59:23 -07:00
Seth Alves	21ca767b7c	remove setPosition and setRotation for actions because they were never finished and never used.	2017-04-18 11:59:16 -07:00
Andrew Meadows	31bfc98b87	use const reference for ScenePointer when possible	2017-04-18 11:52:22 -07:00
Andrew Meadows	5a458c9923	remove last qApp usage from Avatar class	2017-04-18 11:52:21 -07:00
Andrew Meadows	685a01482c	remove Camera argument from Avatar::render()	2017-04-18 11:52:21 -07:00
kunalgosar	06c5fa0585	correctly resizing blendshapes vector	2017-04-18 11:44:59 -07:00
kunalgosar	d215856b23	cleanup to blendshapes	2017-04-18 11:44:59 -07:00
kunalgosar	0a295fc258	setBlendshapes will presist	2017-04-18 11:44:59 -07:00
samcake	f8a59aa255	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-18 11:04:16 -07:00
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
Dante Ruiz	cd095915ef	removed emacs junk file from my repo	2017-04-18 00:32:30 +01:00
Dante Ruiz	6d44cd4d1e	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-18 00:18:55 +01:00
Dante Ruiz	c298886896	hooking up the input playback	2017-04-18 00:17:14 +01:00
Zach Fox	e13000410e	Whoops	2017-04-17 11:02:27 -07:00
druiz17	4bf3fa56f8	saving work	2017-04-16 21:26:09 -07:00
Seth Alves	fbd4677a9a	add a way to set hinge-constraint motor speed from javascript	2017-04-15 21:10:02 -07:00
Seth Alves	b4ff3a8691	don't destroy and recreate constraints when reinserting rigid body	2017-04-15 21:08:59 -07:00
Seth Alves	d42970d480	fix hinge-constraint constructors to use otherAxis	2017-04-15 08:51:08 -07:00
Sam Cake	61ed5c3ce9	THank you mac	2017-04-15 01:35:28 -07:00
Sam Cake	2b97171061	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 01:06:01 -07:00
Sam Cake	038d01ce04	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 00:45:50 -07:00
Sam Cake	96960a505d	COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side	2017-04-14 23:22:45 -07:00
Anthony J. Thibault	22e79504bb	Elliptical swing targets for the spine, Bug fix for debug draw	2017-04-14 17:00:50 -07:00
Anthony J. Thibault	b49760cee2	Remove hand IK target collision with body capsule	2017-04-14 17:00:49 -07:00
Anthony J. Thibault	d464020577	Adjust min angle of knee constraint to prevent leg locks	2017-04-14 17:00:48 -07:00
Anthony J. Thibault	d3b4a2c08d	better "auto" configuration	2017-04-14 17:00:47 -07:00
Anthony J. Thibault	0ebaba7cf8	Now supports sensorConfig with hips and chest sensors	2017-04-14 17:00:46 -07:00
Anthony J. Thibault	adaf7dda7c	Check in viveMotionCapture test script.	2017-04-14 17:00:45 -07:00
Anthony J. Thibault	a10b157aff	First pass at having an explicit Hips IK target. ... Also, AnimManipulator nodes support setting position and rotation on a single joint.	2017-04-14 17:00:44 -07:00
Seth Alves	41fb05ecf7	bump protocol version	2017-04-14 16:26:54 -07:00
Seth Alves	371118a6c0	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 16:26:30 -07:00
Seth Alves	f08fecbfa7	make sure new constraint data gets transmitted over network	2017-04-14 16:25:27 -07:00
David Rowe	2731c13a5c	Merge remote-tracking branch 'upstream/master' into 21249	2017-04-15 09:51:16 +12:00
Seth Alves	708008d8a5	cleanups	2017-04-14 13:43:48 -07:00
Sam Gateau	3519a72f8a	Merge pull request #10190 from samcake/ambient-bis ... Introducing a tool to debug the current Zone Stack	2017-04-14 13:28:59 -07:00
Seth Alves	07b23b8235	expose other hinge-constraint parameters to javascript	2017-04-14 13:28:25 -07:00
Seth Alves	d17d12446b	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 12:49:03 -07:00
Seth Alves	d0144f4110	avatar-action-far-grab works now	2017-04-14 12:44:54 -07:00
Thijs Wenker	6f58e91d76	Merge pull request #10121 from birarda/bug/recording-cache ... cleanup Agent RSI handling, make loadRecording async	2017-04-14 21:35:51 +02:00
Stephen Birarda	7b48feca66	address code review comments	2017-04-14 11:53:53 -07:00
Seth Alves	b1dc5be316	make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar	2017-04-14 11:48:06 -07:00
Sam Cake	f991475004	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-14 11:33:21 -07:00
Seth Alves	2dab3069da	fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called.	2017-04-14 11:06:40 -07:00
Seth Alves	f5a5369055	attempt to remove dynamics associated with a rigid-body before removing the rigid-body	2017-04-14 07:06:53 -07:00
Seth Alves	52aee63e05	keep track of objectDynamics per rigidBody	2017-04-14 06:08:58 -07:00
Sam Cake	bb15b8c701	ANd fixing the gl41 rendering	2017-04-14 00:46:41 -07:00
Sam Cake	29545f0918	FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend	2017-04-13 23:53:56 -07:00
David Rowe	c2d8755b15	Merge branch 'master' into 21249	2017-04-14 15:32:45 +12:00
Seth Alves	afa8fc161b	allow hinge constraint between two entities	2017-04-13 15:37:28 -07:00
Andrew Meadows	e364b8d33e	avatar-mixer resends to avoid stale avatar	2017-04-13 13:35:59 -07:00
Seth Alves	7695d2ac05	put the protocol version back to what's in master, for now	2017-04-13 11:29:40 -07:00
Sam Cake	3b385772c3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-13 09:51:27 -07:00
Sam Cake	78bfc006f1	Prototyping the ResourceBuffer with the DrawBounds Job, yeah	2017-04-13 00:51:02 -07:00
samcake	d41f34ce8d	Adding support for the resource buffer	2017-04-12 19:07:27 -07:00
Seth Alves	1ab3a1eb60	bump entity-protocol version	2017-04-12 16:36:04 -07:00
Seth Alves	9b12956909	formatting	2017-04-12 16:34:34 -07:00
Seth Alves	0eb9507a10	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:25:50 -07:00
Brad Davis	b2aa3271f7	Adding support for variable allocated textures to the GL 4.1 backend	2017-04-12 15:09:20 -07:00
Andrew Meadows	e64e2614e3	Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter ... Kinect hand filter	2017-04-12 14:27:05 -07:00
Seth Alves	507f658a5f	update comment	2017-04-12 07:37:41 -07:00
Seth Alves	9f252f04e7	cleanups	2017-04-12 07:25:23 -07:00
Seth Alves	53cb192af1	fixed names of pivot and axis	2017-04-12 07:22:27 -07:00
Seth Alves	cc77fce95f	hinge is sort-of working	2017-04-12 07:12:05 -07:00
Seth Alves	2b0315645c	actions work again	2017-04-11 21:11:03 -07:00
Seth Alves	74c0a70cb0	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
David Rowe	0d9e0ebfec	Merge branch 'master' into 21249	2017-04-12 08:45:01 +12:00
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
Chris Collins	c86acfafef	Merge pull request #10120 from huffman/feat/stick-default-avatar ... Change default avatar to ball and stick avatar	2017-04-11 12:56:25 -07:00
samcake	5daf365784	Avoiding warning maybe	2017-04-11 12:15:30 -07:00
Chris Collins	3a603e7ced	Merge pull request #10193 from sethalves/fix-dont-delete-tablet-qobject ... change handling of life-time of TabletProxy QObjects	2017-04-11 11:53:47 -07:00
Zach Fox	6569de697d	Merge pull request #10187 from zfox23/fix/getAvatar_Fix ... Fix FB3999; Fix crashes caused by getAvatar() design bug	2017-04-11 11:17:48 -07:00
samcake	612acbc6d5	Avoid pointers on temp var	2017-04-11 10:56:58 -07:00
Seth Alves	077a4fe4ae	change handling of life-time of TabletProxy QObjects	2017-04-11 10:56:47 -07:00
samcake	79bcf95792	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-11 10:00:34 -07:00
druiz17	b7daf8c80b	Merge pull request #10191 from sethalves/fix-collision-hull-munging ... fix -- munge collision-hull at last minute rather than store munged url as a property	2017-04-11 09:09:54 -07:00
Dante Ruiz	d823093ddb	fixed merge conflict	2017-04-11 16:58:25 +01:00
Seth Alves	bf16309917	Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002 ... avoid invisible avatars redux	2017-04-11 07:07:03 -07:00
Seth Alves	938fab6f59	Merge pull request #10061 from humbletim/fix-cached-ResourceCache ... Fix cached ResourceCache::prefetch() state updates	2017-04-11 07:04:06 -07:00
Seth Alves	b99959c73d	munge collision-hull at last minute rather than store munged url as a property	2017-04-11 07:00:22 -07:00
Sam Cake	1dd98af1dd	And introduce a clean sorted select of the items so we keep the order of rendering of the boxes of the zone in the ZOne stack order, the color of box reflect the order (from red to blue)	2017-04-11 01:21:45 -07:00
Sam Cake	80c781bcdc	Fixing warning on mac and more description of the Task class	2017-04-10 22:17:12 -07:00
Stephen Birarda	db6fc40277	fix ScriptAvatar promotion of AvatarData	2017-04-10 22:15:45 -07:00
Stephen Birarda	84a5807ff1	return ScriptAvatarData raw pointer from getAvatar	2017-04-10 22:15:45 -07:00
Stephen Birarda	6c49db0f1b	add missing include for qScriptRegisterMetaType in Agent	2017-04-10 22:15:45 -07:00
Stephen Birarda	42a406e90a	add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts	2017-04-10 22:15:45 -07:00
Zach Fox	0aa1e633fe	Fix overrides and warnings (finally?)	2017-04-10 22:15:45 -07:00
Zach Fox	2561d38d93	Fix GCC warning	2017-04-10 22:15:45 -07:00
Zach Fox	04792bf3bc	Typo fix.	2017-04-10 22:15:45 -07:00
Zach Fox	16be0ca70c	Birarda's CR changes	2017-04-10 22:15:44 -07:00
Zach Fox	1984d5bc0c	Cleanup	2017-04-10 22:15:44 -07:00
Zach Fox	3832abffee	Almost theregit add -A	2017-04-10 22:15:44 -07:00
Zach Fox	4489c34e84	I'm on fire	2017-04-10 22:15:44 -07:00
Zach Fox	5edd5d2b30	It's working...it's workinggit add -A!	2017-04-10 22:15:44 -07:00
Zach Fox	a16e261735	Checkpoint before a number of confusing changes	2017-04-10 22:15:44 -07:00
Zach Fox	297da90118	Semicolons lol	2017-04-10 22:15:44 -07:00
Zach Fox	bc75ff4462	Checkpoint	2017-04-10 22:15:44 -07:00
Zach Fox	177445c371	Does this work?	2017-04-10 22:15:44 -07:00
Stephen Birarda	4ed22ad7ac	move audio loudness to AvatarData, change AvatarData to ScriptOwnership	2017-04-10 22:15:44 -07:00
Zach Fox	1ed53113a9	Commit for birarda - testing QSharedPointer instead; doesn't work right now	2017-04-10 22:15:44 -07:00
Zach Fox	6ddd7a612c	Initial pass at fix looks promising	2017-04-10 22:15:44 -07:00
Ryan Huffman	af11f5f327	Update avatar mixer packet version for stick+ball avatar	2017-04-10 21:27:47 -07:00
Sam Cake	5d7accca2b	Avoiding the mac compilation problem maybe	2017-04-10 21:12:00 -07:00
samcake	4a47737d0b	REfining the Config behavior, trying to pr next	2017-04-10 19:01:49 -07:00
Stephen Birarda	602d65a71a	Merge pull request #10001 from birarda/cleanup-ebp ... cleanup EncodeBitstreamParams to use nodeData when possible	2017-04-10 15:54:30 -07:00
Ryan Huffman	8463fffc8c	Merge pull request #10185 from highfidelity/revert-10116-bug/rel-ext-textures ... Revert "fix relative/absolute path handling for external FBX textures"	2017-04-10 15:30:40 -07:00
Seth Alves	b9afcd3f0a	Merge pull request #10178 from sethalves/fix-compound-collision-hulls ... Fix compound collision hulls	2017-04-10 15:28:48 -07:00
Stephen Birarda	e86db26224	Revert "fix relative/absolute path handling for external FBX textures"	2017-04-10 14:31:02 -07:00
Seth Alves	8a3a52cbcf	make getCollisionGeometryResource a separate call from getGeometryResource rather than passing a bool	2017-04-10 13:54:24 -07:00
Seth Alves	6bd841857f	added a comment	2017-04-10 13:50:36 -07:00
Dante Ruiz	e0f19944bc	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix	2017-04-10 20:58:46 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
Seth Alves	05bf1930ca	Merge pull request #10169 from hyperlogic/feature/absolute-default-joints-in-object-frame ... Added accessor to get Avatar default pose in avatar space	2017-04-10 12:55:02 -07:00
David Rowe	0a19b502fd	Merge branch 'master' into 21249	2017-04-11 07:04:05 +12:00
Andrew Meadows	e20fcca959	Merge pull request #10179 from jherico/avatar_rendering ... Creating new avatar rendering library, prepping for crowd rendering project	2017-04-10 11:29:08 -07:00
Bradley Austin Davis	0ca0874c52	Creating new avatar rendering library, prepping for crowd rendering project	2017-04-10 10:55:04 -07:00
Seth Alves	717436e0fd	use QUrl rather than just munging the url with a string-append	2017-04-10 10:54:30 -07:00
Seth Alves	554b23357c	add combineParts flag to getGeometryResource. append ?collsion-hull to urls that are used as compound collision hulls	2017-04-10 10:14:36 -07:00
samcake	16e6f0900d	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-10 10:12:23 -07:00
Seth Alves	36940b4dfe	revert commit that broke sendToScript	2017-04-10 09:11:23 -07:00
Sam Cake	e7fb18bd2f	MOving forward with the TaskConcept and TaskModel, all working	2017-04-10 02:51:19 -07:00
Sam Cake	a458828590	MOving forward with the TaskConcept and TaskModel, all working	2017-04-10 02:30:13 -07:00
Seth Alves	0ae8a20b53	Merge branch 'master' of github.com:highfidelity/hifi into fix-compound-collision-hulls	2017-04-09 18:08:02 -07:00
Seth Alves	a1cab2c0d1	working toward fixing compound hulls	2017-04-09 17:23:56 -07:00
David Rowe	6896fe3ac6	Merge branch 'master' into 21249	2017-04-10 09:05:57 +12:00