19906 commits

Author	SHA1	Message	Date
Seth Alves	d84dd4ce67	Merge pull request #10234 from druiz17/webview-redesign ... tablet webview navigation bar redesigned	2017-04-18 10:23:39 -07:00
Seth Alves	b2de5ebdaf	Merge pull request #10136 from mittens/21217 ... Added quadratic ease-in-and-out smoothing to remote avatars	2017-04-18 10:05:48 -07:00
Dante Ruiz	31b61c3225	removed white space	2017-04-18 00:24:34 +01:00
Dante Ruiz	e46d9da98f	fixed merge conflict	2017-04-18 00:22:35 +01:00
Zach Fox	9c4e367245	Merge pull request #10213 from zfox23/fixGoToFocus ... FB 4156; Fix GoTo text field focus; other GoTo tweaks	2017-04-17 12:13:41 -07:00
Zach Fox	e6edce5352	Entirely remove addressBarToggle()	2017-04-17 12:13:01 -07:00
Zach Fox	7a7cfb84e5	Remove HMD keyboard focus toggle on AddressBar input	2017-04-17 10:08:40 -07:00
Dante Ruiz	3eb9b37c29	Merge branch 'master' of github.com:highfidelity/hifi into webview-redesign	2017-04-17 16:41:15 +01:00
David Kelly	3e268fbf68	put shareable_url in UserStory details when creating	2017-04-17 07:38:24 -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
Zach Fox	a4587e33f3	Tiny forward/backward icon updates	2017-04-14 13:19:33 -07:00
Zach Fox	a623ced64e	Fix hover states on back/forward buttons	2017-04-14 12:43:07 -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
Dante Ruiz	863d64b2fd	removed comments and non-needed files	2017-04-14 18:06:44 +01:00
Dante Ruiz	7189d4d7fa	daving web work	2017-04-14 17:01:23 +01:00
Zach Fox	0543709081	Focus fix	2017-04-13 16:10:36 -07:00
Zach Fox	520ceebf5b	Small HMD tweaks	2017-04-13 15:52:59 -07:00
Zach Fox	d9dc8ebc41	More improvements	2017-04-13 15:48:51 -07:00
Zach Fox	f23f9ec698	Merge pull request #10207 from zfox23/gifShareImprovements ... Snapshot sharing improvements	2017-04-12 16:33:44 -07:00
Zach Fox	71caf85a27	Quick fix!	2017-04-12 14:57:44 -07:00
Zach Fox	c724c2e50b	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	87b2d5bf8a	New loading icon	2017-04-12 14:45:57 -07:00
Zach Fox	75f1168b19	Clearer function names	2017-04-12 14:45:57 -07:00
Zach Fox	e296383b1b	Checkpoint!	2017-04-12 14:45:56 -07:00
Chris Collins	c545558b8a	Merge pull request #10199 from AndrewMeadows/avatar-should-vanish ... Avatar should vanish when teleporting far away	2017-04-12 12:28:46 -07:00
Zach Fox	ef2cea0d63	Merge pull request #10203 from zfox23/fix/avatarMouthsMoving ... Make avatar's mouths move again	2017-04-12 11:36:03 -07:00
Zach Fox	39587d5308	lol	2017-04-12 10:54:28 -07:00
David Kelly	a12407ddda	Merge pull request #10202 from davidkelly/dk/3934 ... Connection sort change	2017-04-12 10:42:04 -07:00
David Kelly	058a5b14a4	damn linter didn't run - vimrc work ahead...	2017-04-12 10:22:40 -07:00
David Kelly	9376ac646f	offline people sort change	2017-04-12 08:41:36 -07:00
Andrew Meadows	b8a3c856be	update model transform even when out of view	2017-04-11 15:03:11 -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
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
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
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
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
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	42a406e90a	add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts	2017-04-10 22:15:45 -07:00
Zach Fox	a16e261735	Checkpoint before a number of confusing changes	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	6ddd7a612c	Initial pass at fix looks promising	2017-04-10 22:15:44 -07: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