18148 commits

Author	SHA1	Message	Date
David Kelly	b8523a1e8b	Merge pull request #9071 from howard-stearns/no-snapshots-welcome ... suggestions filter/group	2016-11-17 12:20:48 -08:00
howard-stearns	5b57354624	crazy workaround for qt bug	2016-11-16 17:03:24 -08:00
howard-stearns	050d343849	styling changes	2016-11-16 15:54:11 -08:00
Ryan Huffman	c6b64081fc	Add Overlays jsdocs	2016-11-16 12:01:05 -08:00
Ryan Huffman	7e9df928f4	Add jsdoc comments to Menu	2016-11-16 10:49:50 -08:00
howard-stearns	fef68ac53a	gap between top and scroll	2016-11-16 10:02:17 -08:00
howard-stearns	f21036c742	Merge branch 'master' of https://github.com/highfidelity/hifi into no-snapshots-welcome	2016-11-16 09:18:41 -08:00
howard-stearns	b0518feee4	split ToolbarButton.qml into a stateful image part	2016-11-15 14:59:27 -08:00
howard-stearns	182050c4b9	don't process stale query responses	2016-11-15 14:34:23 -08:00
howard-stearns	9809515853	styling	2016-11-15 14:12:27 -08:00
Brad Hefta-Gaub	84573d373b	Merge pull request #9070 from huffman/fix/docs ... Add jsdoc to Camera	2016-11-15 13:46:16 -08:00
Ryan Huffman	3fcc2d3fa5	Add jsdoc to Clipboard	2016-11-14 13:52:16 -08:00
Ryan Huffman	7e2bb0e5ed	Cleanup camera docs	2016-11-14 13:51:51 -08:00
howard-stearns	6078b833a1	Merge remote-tracking branch 'origin/group-snapshots-by-place' into no-snapshots-welcome	2016-11-14 13:47:32 -08:00
howard-stearns	4cdda7c20f	Merge remote-tracking branch 'origin/quasi-tabbed-goto' into no-snapshots-welcome	2016-11-14 13:13:58 -08:00
Ryan Huffman	ec86b82079	Add jsdoc to Camera	2016-11-14 12:14:24 -08:00
Atlante45	f8be4227d9	Fix Blast screen typos	2016-11-14 12:06:25 -08:00
Howard Stearns	fac5d1e12e	group snapshots by place	2016-11-12 17:00:54 -08:00
Howard Stearns	17428d7ecb	tab-like filtering of suggestions by type	2016-11-12 15:23:11 -08:00
Howard Stearns	fcbf4f421a	no scroll margins	2016-11-12 10:04:15 -08:00
Chris Collins	0876dbc809	Merge pull request #9050 from sethalves/last-edited-by ... lastEditedBy property for entities	2016-11-11 16:02:18 -08:00
Brad Hefta-Gaub	0dc7f0bf17	Merge pull request #9055 from jherico/fix_stats ... Fix buffer count in stats display	2016-11-11 13:31:55 -08:00
Brad Davis	0aec9400c7	Fix buffer count in stats display	2016-11-11 12:54:19 -08:00
Chris Collins	b9b90cc646	Merge pull request #9047 from jherico/stutter ... Add stutter tracking	2016-11-11 11:39:00 -08:00
Seth Alves	15c247fc5e	quiet warnings	2016-11-11 06:37:22 -08:00
Seth Alves	5629db9109	Merge pull request #9049 from birarda/max-min-av-scale ... add a min/max avatar scale in domain-server settings	2016-11-11 06:11:02 -08:00
Brad Hefta-Gaub	a90a0fe8ba	Merge pull request #8976 from druiz17/FixMenuOutOfView ... Fixed menu out of view with HMD and Xbox controller	2016-11-10 18:49:34 -08:00
Brad Hefta-Gaub	6db3556dc5	Merge pull request #9048 from howard-stearns/disable-viewpoint-menus-in-hmd ... Disable viewpoint menus in hmd	2016-11-10 17:52:50 -08:00
Stephen Birarda	020942c826	better handling for a flipped min/max scale	2016-11-10 16:50:36 -08:00
Stephen Birarda	88c63332de	protect flipped min/max scale in avatar mixer settings	2016-11-10 16:21:48 -08:00
Brad Davis	16060d50af	Merge pull request #9041 from jherico/disable_incremental ... Remove incremental texture transfers	2016-11-10 15:43:20 -08:00
Stephen Birarda	272d0c845e	add clarifying comments about target scale changes	2016-11-10 15:25:15 -08:00
Stephen Birarda	d5722c1654	fix clamping of scale and DRY it up	2016-11-10 15:03:13 -08:00
howard-stearns	4d18a3cc3d	expose menu enablement to javascript	2016-11-10 15:01:06 -08:00
Stephen Birarda	53769f4edf	change scale for avatar if domain limited scale changes	2016-11-10 14:58:04 -08:00
Stephen Birarda	9fdde49d14	clamp target scale changes on both ends	2016-11-10 14:54:42 -08:00
Stephen Birarda	6f442a74b1	request settings from agents and debug results	2016-11-10 14:43:15 -08:00
Stephen Birarda	77ede81fc9	limit MyAvatar scale to limits from domain settings	2016-11-10 13:27:13 -08:00
Brad Davis	c7d68aa9cf	Add stutter stat logging	2016-11-10 13:15:35 -08:00
Brad Davis	90f55f0cd5	Add stutter tracking	2016-11-10 11:56:38 -08:00
Brad Hefta-Gaub	ff559aa4a1	Merge pull request #9042 from hyperlogic/feature/jsdoc ... Generate JS documentation from comments in C++ source	2016-11-10 10:17:39 -08:00
Brad Davis	db98a742b6	Remove incremental transfers	2016-11-10 08:35:35 -08:00
Anthony J. Thibault	839b1a3c5e	Added some jsdoc comments to the C++ source	2016-11-09 18:09:10 -08:00
samcake	f5fd4bf8d1	Merge pull request #9014 from jherico/texture_derez ... Re-enable downsampling for non-sparse textures	2016-11-09 17:18:03 -08:00
Brad Hefta-Gaub	770bf35d2b	CR feedback	2016-11-09 14:31:18 -08:00
Brad Hefta-Gaub	cf3d1011f4	remove scripts from avatar attached entities for other avatars	2016-11-09 12:26:57 -08:00
Brad Davis	192c72ff99	Update menu, initial state for texture management	2016-11-09 12:09:25 -08:00
Howard Stearns	666d2dd2fc	Merge pull request #9031 from davidkelly/dk/2178 ... Log snapshot upload and user story creation errors	2016-11-08 12:11:16 -08:00
Howard Stearns	0a56f7c4fe	Merge pull request #9009 from howard-stearns/fix-numeric-keyboard-for-window-prompt ... fix numeric keyboard for hmd Window.prompt	2016-11-08 12:05:13 -08:00
David Kelly	1766ebab2c	Added a bit more logging	2016-11-08 09:08:34 -08:00