53442 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	4af4ff2882	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-04-11 17:24:32 -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
samcake	5daf365784	Avoiding warning maybe	2017-04-11 12:15:30 -07:00
Seth Alves	f555ae253f	Merge pull request #10192 from druiz17/tablet-webview-fix ... webview go back to previous page fix	2017-04-11 12:11:43 -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
Dante Ruiz	9c79e62004	webview-fix	2017-04-11 18:49:40 +01: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
Chris Collins	836b4993cc	Merge pull request #10188 from druiz17/homebutton-fix-crash ... fix crashes when clicking in the homebutton	2017-04-11 09:00:35 -07:00
Dante Ruiz	d823093ddb	fixed merge conflict	2017-04-11 16:58:25 +01:00
Seth Alves	d5f5192954	Merge pull request #10174 from vladest/fix-snapshot-login-cancel ... Check if dialog was opened from StackView and then pop or just go to …	2017-04-11 07:07:29 -07: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	b8620f6919	make getAvatar in AvatarManager Q_INVOKABLE	2017-04-10 22:15:45 -07:00
Stephen Birarda	e7299a5435	add missing include for ScriptAvatar in AvatarManager	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
Zach Fox	54ca8bd89e	grab audio loudness from correct avatar	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
Dante Ruiz	daf25c1fe8	fix crashes when clicking in the homebutton	2017-04-11 00:25:08 +01:00
Chris Collins	d8581c1026	Merge pull request #10176 from vladest/snaps_hover ... Added hover to Snaps and Places	2017-04-10 16:09:43 -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
Howard Stearns	7ad185ddfe	Merge pull request #10186 from sethalves/fix-all-places ... fix includeActions so places show up in All	2017-04-10 15:35:17 -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