19818 commits

Author	SHA1	Message	Date
samcake	16e6f0900d	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-10 10:12:23 -07:00
Philip Rosedale	c74778116a	Merge pull request #10156 from Triplelexx/21256 ... 21256 - Add packet loss % to stats	2017-04-09 18:00:01 -07:00
Sam Cake	b65448bcbe	Trying to improve the Job/Task classes and testing it with the ZoneRenderer	2017-04-09 11:08:35 -07:00
Triplelexx	7936637e9c	and tired..	2017-04-09 11:02:35 +01:00
Triplelexx	54eb7c10c6	distracted	2017-04-09 10:50:22 +01:00
Triplelexx	ec6885a2fb	change audioPacketLoss stat to display largest of upstream/downstream loss	2017-04-09 09:49:41 +01:00
Seth Alves	aa89903a9f	Merge pull request #10160 from vladest/tabletwebview-yahoo-fix ... Yahoo, Reddit etc now works correctly	2017-04-08 20:25:18 -07:00
Chris Collins	8e12f62cbb	Merge pull request #10153 from druiz17/goto-fix ... Ability to toggle goto with the crt-l and enter keys	2017-04-07 16:36:41 -07:00
Chris Collins	1175f65cb0	Merge pull request #10162 from vladest/goto-white-buttons-fix ... Check if offset outside image, set to last image	2017-04-07 15:58:48 -07:00
Howard Stearns	57d8ec883e	Merge pull request #10163 from davidkelly/dk/3938 ... updated availability combo dialog	2017-04-07 13:57:17 -07:00
Seth Alves	03065ee6c8	Merge pull request #9938 from kunalgosar/jsRenderBug ... Stop WebEntities Running Files and Commands	2017-04-07 13:44:03 -07:00
Dante Ruiz	cde9310f3e	goto home button fix	2017-04-07 21:35:28 +01:00
Dante Ruiz	909fda98a4	git goto button toggle hightlight	2017-04-07 21:01:53 +01:00
David Kelly	870e003311	Scattered X glyphs around the letterbox and combo dialogs	2017-04-07 11:12:54 -07:00
Vladyslav Stelmakhovskyi	a1892b351f	Cant use underscores outside class internals	2017-04-07 19:40:46 +02:00
David Kelly	ee9bc0bfa4	updated availability combo dialog	2017-04-07 10:25:37 -07:00
Vladyslav Stelmakhovskyi	9a563ba02f	Check if offset outside image, set to last image	2017-04-07 19:17:09 +02:00
Andrew Meadows	b9c7d6351f	Merge pull request #10135 from samcake/ambient ... Rename render::PendingChanges to render::Transaction	2017-04-07 09:54:10 -07:00
Triplelexx	fcfd206e9c	change implict conversions	2017-04-07 17:47:04 +01:00
David Kelly	12b5b91754	Merge pull request #10161 from howard-stearns/fix-pal-connections-help ... fix pal connections-tab help trigger	2017-04-07 09:34:11 -07:00
Howard Stearns	468cc7f19b	Merge pull request #10150 from davidkelly/dk/3930 ... friends checkbox speedup	2017-04-07 09:27:39 -07:00
Howard Stearns	03013ecb3a	fix pal connections-tab help trigger	2017-04-07 07:30:36 -07:00
Vladyslav Stelmakhovskyi	f88ba7bc57	Yahoo, Reddit etc now works correctly	2017-04-07 15:45:33 +02:00
David Kelly	d64a803451	no need to set checked	2017-04-06 16:08:48 -07:00
David Kelly	a1c211395b	Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column ... fix sorting by pal connections-tab friends column	2017-04-06 15:43:21 -07:00
Howard Stearns	67f2cc3567	Merge pull request #10148 from davidkelly/dk/3936 ... pal selection changes	2017-04-06 14:58:46 -07:00
howard-stearns	9577102c22	fix sorting by pal connections-tab friends column	2017-04-06 14:45:08 -07:00
Dante Ruiz	a89081601c	fix merge issues	2017-04-06 22:31:47 +01:00
Dante Ruiz	52fd446d4d	toggle goto in tablet	2017-04-06 22:27:37 +01:00
David Kelly	331f2da4f8	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936	2017-04-06 14:22:08 -07:00
Seth Alves	3c6429cdf3	Merge pull request #10103 from vladest/master-qml-bugfixes ... Master qml bugfixes	2017-04-06 14:22:06 -07:00
David Kelly	726395ac3e	friends checkbox speedup	2017-04-06 14:07:07 -07:00
Howard Stearns	f7ef587c61	Merge pull request #10138 from davidkelly/dk/3935 ... Now you can forget connections	2017-04-06 14:05:25 -07:00
David Kelly	46a7d28e16	Merge pull request #10144 from howard-stearns/notice-login-change-in-pal ... notice login/logout change in pal	2017-04-06 12:57:22 -07:00
David Kelly	e0a1422345	pal selection changes	2017-04-06 12:07:51 -07:00
samcake	19d080c4cc	Merging	2017-04-06 11:33:41 -07:00
howard-stearns	1d60a55d5f	notice login/logout change in pal	2017-04-06 11:20:08 -07:00
David Kelly	85c78da839	updated, plus fixed some annoying errors in logs from Pal.qml	2017-04-06 11:16:51 -07:00
Vladyslav Stelmakhovskyi	16fa7988f6	TabletWebView redesigned to single WebView instance	2017-04-06 17:53:46 +02:00
Triplelexx	f588612fc3	add audioPacketLoss % display in stats	2017-04-06 16:04:14 +01:00
David Kelly	06bd9c97bf	remove info button from avatar image	2017-04-05 18:21:54 -07:00
David Kelly	61ece265f4	now you can forget connections	2017-04-05 18:16:16 -07:00
Dante Ruiz	5bb4edf18c	Merge branch 'master' of github.com:highfidelity/hifi into goto-fix	2017-04-06 00:16:59 +01:00
Dante Ruiz	90f5d02c99	goto toggle option	2017-04-06 00:13:53 +01:00
samcake	1a9005ed8b	Avoid unexpected changes	2017-04-05 13:57:40 -07:00
samcake	8356e5495f	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-04-05 13:12:21 -07:00
samcake	6122155880	Renaming the PendingCHanges class to Transaction	2017-04-05 13:10:31 -07:00
Dante Ruiz	34f3c4abee	removed mousearea	2017-04-05 18:08:03 +01:00
Dante Ruiz	de8b7eeb27	removed commented code	2017-04-05 18:02:55 +01:00
Dante Ruiz	24b89275f2	fix new model dialog textInput	2017-04-05 18:00:43 +01:00