21903 commits

Author	SHA1	Message	Date
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
Brad Davis	2a2102c7fe	Recompute memory pressure state after each promote / demote call	2017-04-18 15:12:34 -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
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
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
Seth Alves	077a4fe4ae	change handling of life-time of TabletProxy QObjects	2017-04-11 10:56:47 -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
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
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
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
Seth Alves	36940b4dfe	revert commit that broke sendToScript	2017-04-10 09:11:23 -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