64 commits

Author	SHA1	Message	Date
Howard Stearns	eb67254e54	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 16:54:14 -07:00
Ryan Huffman	dc5d5cbb63	Add asset server ping to stats	2015-08-25 15:06:40 -07:00
Howard Stearns	dc75b238a8	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates ... And update with current code.	2015-08-18 15:35:37 -07:00
Seth Alves	551f0aaba3	show how many times per second Application::idle is called	2015-08-18 01:41:17 -07:00
Brad Davis	da031b039c	Removing qml wanrings	2015-06-23 10:58:52 -07:00
Brad Davis	99c217184b	Fixing the mic/camera buttons and the mirror UI buttons	2015-06-19 14:46:39 -07:00
Brad Davis	9bef5f011b	Reverting mirror functionality	2015-06-19 00:03:46 -07:00
Bradley Austin Davis	e75b1a6794	Merge branch 'temp' into overlay	2015-06-18 14:03:25 -07:00
Bradley Austin Davis	1bae1d6065	Changing font size for timings	2015-06-18 13:59:48 -07:00
Bradley Austin Davis	7bbaf026f3	use a monospace font on all platforms	2015-06-18 13:33:37 -07:00
Brad Davis	84c3dab3d8	Fixing error in stats qml parsing	2015-06-18 00:23:40 -07:00
Brad Davis	1e90aaf9c3	Working on overlays still, mirror rendering and overlay order	2015-06-17 11:35:30 -07:00
Brad Davis	2bf53b625e	Working on overlays and stats	2015-06-17 02:00:13 -07:00
Brad Davis	659fa2387c	Working on overlays / stats	2015-06-16 21:00:13 -07:00