54171 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ken Cooke	9e77771c99	Update WASAPI audio plugin for Qt5.6.2	2017-04-28 12:00:01 -07:00
Seth Alves	2a0fc5b34c	Merge pull request #10273 from hyperlogic/feature/hips-ik-target ... Avatar IK system now supports manipulating the hips.	2017-04-28 09:17:33 -07:00
Howard Stearns	a2721d21ef	Merge pull request #10278 from zfox23/newSnapshotReview ... New Snapshot Review Dialog	2017-04-28 07:25:47 -07:00
Howard Stearns	e0282f63f3	Merge pull request #10315 from howard-stearns/address-bar-ux ... address bar ux	2017-04-28 07:21:53 -07:00
Howard Stearns	0ad8f4d985	remove debugging	2017-04-28 07:15:22 -07:00
Anthony J. Thibault	c61e6a8a9e	AnimInverseKinematics: reduce number of magic constants	2017-04-27 18:24:21 -07:00
Anthony J. Thibault	b80270400f	Merge branch 'master' into feature/hips-ik-target	2017-04-27 18:15:12 -07:00
howard-stearns	aed762e986	ux	2017-04-27 17:16:03 -07:00
Zach Fox	3f146fca9d	Fix announcement audience; Fix disabled buttons	2017-04-27 15:36:59 -07:00
Seth Alves	2c2f51689a	Merge pull request #10300 from vladest/tablet-edit-tocreate ... Renamed EDIT to CREATE	2017-04-27 15:31:14 -07:00
Zach Fox	4152e44d2c	Click anywhere on the image except the bottom to toggle share buttons	2017-04-27 14:01:08 -07:00
Zach Fox	3ce81844da	Snapshot JS interface for better Settings handling	2017-04-27 14:01:08 -07:00
Zach Fox	794751abfa	Nested objects aren't REAL!	2017-04-27 14:01:08 -07:00
Zach Fox	832e16ef86	Visual tweaks; fix active share buttons; comment out tests	2017-04-27 14:01:07 -07:00
Zach Fox	7297355183	Open ShareBar on P0 by default	2017-04-27 14:01:07 -07:00
Zach Fox	0ac660d4ab	Cleanup	2017-04-27 14:01:07 -07:00
Zach Fox	b6601feb1d	It's 5 already?	2017-04-27 14:01:07 -07:00
Zach Fox	a24a48843f	Checkpoint	2017-04-27 14:01:07 -07:00
Zach Fox	b26f31704b	Fix button state; use request()	2017-04-27 14:01:07 -07:00
Zach Fox	6711e8cbc2	Remove duplicate setting; Make settings page open; button state	2017-04-27 14:01:07 -07:00
Zach Fox	3221214283	New Snap FTUE flow	2017-04-27 14:01:07 -07:00
Zach Fox	92187e2424	Making progress towards file chooser dialog	2017-04-27 14:01:07 -07:00
Zach Fox	8c9cd0fad0	Custom social buttons; better testing functionality	2017-04-27 14:01:07 -07:00
Zach Fox	d461723012	Thanks to Jess, slightly different Tweet language	2017-04-27 14:01:07 -07:00
Zach Fox	d7348aabc8	Quick comment updates	2017-04-27 14:01:07 -07:00
Zach Fox	ef2e5f78ff	Startings of needsLogin support	2017-04-27 14:01:07 -07:00
Zach Fox	e1789996fb	Add announcements support	2017-04-27 14:01:06 -07:00
Zach Fox	f838e87f48	Pretty stable...	2017-04-27 14:01:06 -07:00
Zach Fox	7c5de1e60b	Getting closer	2017-04-27 14:01:06 -07:00
Zach Fox	fad470eeea	Checkpoint (this is complicated)	2017-04-27 14:01:06 -07:00
Zach Fox	eaa699bbfd	Wow, it's really coming together!	2017-04-27 14:01:06 -07:00
Zach Fox	880bcf3b1e	Checkpoint	2017-04-27 14:01:06 -07:00
Zach Fox	c08b40b950	Initial sharing code hooked up	2017-04-27 14:01:06 -07:00
Zach Fox	01e78612c7	Soooo much progress today	2017-04-27 14:01:06 -07:00
Zach Fox	16b4af8a9d	Rearchitecture	2017-04-27 14:01:06 -07:00
Zach Fox	2880b22f9f	External share buttons!	2017-04-27 14:01:06 -07:00
Zach Fox	4270086a22	Support 1 and 2 images	2017-04-27 14:01:06 -07:00
Zach Fox	0b4cd41d75	More and more progress!	2017-04-27 14:01:06 -07:00
Zach Fox	a4f428a6e6	Lots of progress	2017-04-27 14:01:06 -07:00
Zach Fox	7acdc86644	Progress	2017-04-27 14:01:05 -07:00
Zach Fox	0860352caa	Checkpoint before switching to crash duty	2017-04-27 14:01:05 -07:00
Howard Stearns	88c3b4d9d3	Merge pull request #10258 from howard-stearns/watch-for-announcements ... watch for announcements	2017-04-27 14:00:39 -07:00
Howard Stearns	5d6e24b495	Merge pull request #10253 from howard-stearns/new-address-bar ... New address bar	2017-04-27 14:00:24 -07:00
David Kelly	539cd96520	Merge pull request #10303 from davidkelly/dk/locationThreadingIssue ... Thread safety for sending location	2017-04-27 13:30:38 -07:00
howard-stearns	e4f259e630	back to non-fake data	2017-04-27 13:01:33 -07:00
howard-stearns	56196c03a3	pr review	2017-04-27 12:56:32 -07:00
David Kelly	63468cc9e1	Thread safety for sending location	2017-04-27 12:20:56 -07:00
howard-stearns	97777a416d	Merge branch 'master' of https://github.com/highfidelity/hifi into new-address-bar	2017-04-27 12:02:02 -07:00
Chris Collins	9f688a08cd	Merge pull request #10302 from Atlante45/new-master ... Pull stable back into master	2017-04-27 11:51:46 -07:00
Philip Rosedale	f555291d92	Merge pull request #10296 from Triplelexx/21296 ... 21296 - Move two menu items	2017-04-27 11:37:07 -07:00