2296 commits

Author	SHA1	Message	Date
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
volansystech	87ceebca82	Merge branch 'master' of https://github.com/highfidelity/hifi into 21200 ... # Conflicts: # scripts/system/controllers/handControllerGrab.js	2017-04-27 12:58:18 +05:30
Seth Alves	60453f8748	Merge pull request #10294 from ctrlaltdavid/record-for-marketplace ... Make record script able to be put on the marketplace	2017-04-26 19:34:39 -07:00
David Rowe	9c7353deb2	Make record script able to be put on the marketplace	2017-04-27 11:22:25 +12:00
anshuman64	c088bd6891	Merge pull request #10271 from humbletim/21281 ... CR Job #21281 -- Doppleganger Mirror	2017-04-26 16:18:14 -07:00
Howard Stearns	7654823775	Merge pull request #10292 from thoys/make-connection-fix ... makeUserConnection.js Fix for alternative skeletons	2017-04-26 16:02:16 -07:00
Zach Fox	9ace7a7488	Merge pull request #10279 from andrewd440/21174 ... 21174 Make the Particle Emitter Easier to Use	2017-04-26 15:35:29 -07:00
humbletim	6e07933356	uncomment UserActivityLogger.logAction	2017-04-26 18:28:54 -04:00
humbletim	f8bbd9174c	Merge remote-tracking branch 'upstream/master' into 21281	2017-04-26 18:26:15 -04:00
anshuman64	5bd9b2e631	Merge pull request #10130 from ctrlaltdavid/21249 ... New avatar record and playback script	2017-04-26 15:18:30 -07:00
humbletim	cabeced66e	* changes per feedback and testing ... * add support for UserActivityLogger.logAction (commented-out, pending #10130) * autodisable doppleganger when avatar changes model * autodisable doppleganger when user moves to a different domain * use ModelCache.prefetch for detecting model load status * expose new signals to help keep activity logging and debugging decoupled	2017-04-26 17:51:21 -04:00
Thijs Wenker	26173700b8	Merge pull request #10267 from Triplelexx/21287 ... 21287 - Newly created entities in Edit.js should be grabbable	2017-04-26 23:16:04 +02:00
Thijs Wenker	bf81ae78b9	Merge branch 'master' of https://github.com/highfidelity/hifi into make-connection-fix ... # Conflicts: # scripts/system/makeUserConnection.js	2017-04-26 22:52:57 +02:00
David Rowe	a68ee02e8d	Log script start-up	2017-04-27 08:41:29 +12:00
Triplelexx	e295ab2778	change location of menu item Create Entities As Grabbable	2017-04-26 21:13:39 +01:00
Thijs Wenker	d05229d3b4	fix conversion	2017-04-26 22:11:56 +02:00
Thijs Wenker	20a9b60e7b	this might make it work	2017-04-26 21:42:36 +02:00
Triplelexx	06b3b84145	changes from CR	2017-04-26 18:50:15 +01:00
Thijs Wenker	0363e96f34	Allow skeletons with different bone structures to become friends (still requires hands)	2017-04-26 18:55:50 +02:00
Thijs Wenker	a25584c90f	ESLINT, style and spelling fixes	2017-04-26 18:51:55 +02:00
Zach Fox	3e24296996	Swap the two lines	2017-04-26 09:10:05 -07:00
Howard Stearns	0f8ee7051c	lint	2017-04-26 08:20:12 -07:00
David Rowe	4581b9a0df	Refresh countdown number upon reopening dialog	2017-04-26 20:13:21 +12:00
Triplelexx	01b11022e3	add menu item to control grabbable setting on newly created entites	2017-04-26 07:26:00 +01:00
humbletim	84c8b2945a	detect and update doppleganger when user changes skeletonModelURLs; cleanup	2017-04-26 01:58:51 -04:00