2291 commits

Author	SHA1	Message	Date
Triplelexx	07e6b766b5	rename FILENAME constants	2017-03-26 23:10:50 +01:00
Triplelexx	dc64065668	Merge remote-tracking branch 'upstream/master' into 21224 ... update	2017-03-26 22:20:24 +01:00
Triplelexx	8f507942cf	change storage location ... still unsure what is best. this is consistent and doesn't require login	2017-03-25 19:10:12 +00:00
Triplelexx	c4bcacf0e0	use QueuedButton for upload dialog	2017-03-25 19:04:40 +00:00
humbletim	5d5d947ddb	updates per discussion with triplelexx	2017-03-25 04:01:02 -04:00
humbletim	630afb716f	consolidate QML->C++ triggering workaround to help compartmentalize the problem for later fixin'	2017-03-25 03:01:35 -04:00
humbletim	96f905362b	alternative way to connect the button?	2017-03-25 01:17:27 -04:00
Triplelexx	bda1d54209	create AvatarBookmarks ... derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass at integration, QML issues noted	2017-03-24 22:58:36 +00:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
Triplelexx	2515563a0b	change getFront to getForward	2017-03-21 22:35:07 +00:00
Chris Collins	ea13151d55	Merge pull request #9945 from mnafees/21233 ... 21233: Remove Scripts Editor option from Edit menu and all related files	2017-03-21 08:01:36 -07:00
Zach Pomerantz	20ea13e00a	Merge pull request #9897 from zzmp/record/noise-gate ... Add AudioNoiseGate to recordings played through Interface	2017-03-21 00:21:20 -04:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Brad Hefta-Gaub	af790d8474	Merge pull request #9875 from birarda/bug/spin-strafe ... fix double snap turn strafing	2017-03-20 10:08:05 -07:00
Chris Collins	af2748410d	Merge pull request #9932 from Triplelexx/21231 ... 21231 - Remove About Interface from File menu	2017-03-20 09:55:57 -07:00
Mohammed Nafees	c460523980	Remove related icon files for Scripts Editor	2017-03-20 00:25:50 -04:00
Triplelexx	a9b1a38665	remove Mini Mirror from View menu ... Avatar inputs only contains the audio meter now.	2017-03-18 00:53:13 +00:00
Triplelexx	eba6c8de5e	remove About Interface from File menu	2017-03-17 17:37:19 +00:00
Andrew Meadows	6f4d9bfba3	Merge pull request #9858 from kunalgosar/logBolding ... Change to Log Font and Formatting	2017-03-16 13:09:37 -07:00
kunalgosar	0cee9ee172	font change	2017-03-16 11:57:46 -07:00
Zach Pomerantz	789bb7c855	rename audio(Mic)OutboundPPS	2017-03-15 13:30:39 -04:00
Stephen Birarda	1fe02477b0	fix LX behaviour in snap/advanced/basic	2017-03-14 14:21:21 -07:00
Stephen Birarda	0926b2df2a	add LX snap turn to standard mapping	2017-03-13 15:14:20 -07:00
Brad Davis	3bef5ad528	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-13 14:30:25 -07:00
Brad Hefta-Gaub	a38965d628	add more audio stats	2017-03-11 09:50:30 -08:00
Brad Hefta-Gaub	6ce50269ac	add audio mixer in/out stats to the client stats	2017-03-10 18:42:18 -08:00
Brad Hefta-Gaub	23e47f2fdc	added icons to the audioScope app	2017-03-10 18:13:35 -08:00
kunalgosar	a974282bdf	bolding timestamps on log	2017-03-10 11:55:36 -08:00
Brad Davis	e94f803b84	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-08 09:03:21 -08:00
howard-stearns	cb41b9135b	fix broken merge	2017-03-07 12:10:52 -08:00
howard-stearns	8a489f36f4	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal	2017-03-07 10:49:53 -08:00
David Kelly	b760e86226	rest of cr feedback	2017-03-07 10:17:32 -07:00
David Kelly	c6dbfc85f0	cr feedback	2017-03-07 09:54:00 -07:00
David Kelly	3d39aae35b	minor tweak - just in case	2017-03-06 15:52:33 -07:00
David Kelly	e14a1ad1af	minor cleanup	2017-03-06 15:26:03 -07:00
David Kelly	db036d997c	first pass	2017-03-06 15:18:35 -07:00
howard-stearns	632cdc1b38	semicolons and whitespace per coding standard	2017-03-06 11:04:12 -08:00
howard-stearns	a715a694f0	fix 'banned user doesn't disappear from pal until refresh'	2017-03-03 16:27:38 -08:00
Bradley Austin Davis	efad7da508	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-03 08:59:24 -08:00
David Kelly	79e440be81	fix unmute when ignoring in PAL (you can't)	2017-03-02 08:36:58 -07:00
Bradley Austin Davis	fa5b315e09	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-01 15:16:18 -08:00
howard-stearns	5be952c4e8	persist sort info for tablet re-opening, and start with column 1	2017-03-01 14:51:48 -08:00
David Kelly	dc754cff5f	magical new glyphs	2017-03-01 13:57:03 -07:00
David Kelly	45293ab130	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting	2017-03-01 12:55:54 -07:00
David Kelly	55d049ff5c	style updates	2017-03-01 12:43:45 -07:00
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07:00
David Kelly	678020fed6	now use it (plus a bit of cleanup)	2017-02-28 15:03:45 -07:00
Atlante45	69ce0a383e	Add sitting animations	2017-02-27 16:38:54 -08:00
howard-stearns	c04fd0ec66	smaller glyph size	2017-02-27 16:07:05 -08:00