4131 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrzej Kapolka	b660336b2a	Fix for camera movement with webcam enabled; don't bother using roll from ... webcam if we have the gyros; reinstate head orientation scaling; don't bother using gyro position.	2013-07-02 16:59:03 -07:00
Leonardo Murillo	e85f498ef3	Merge pull request #612 from birarda/domain-stats ... flip mixer and domain server stat to timer to avoid logstash/graphite bug	2013-07-02 16:43:06 -07:00
Stephen Birarda	a5bd8cf3cd	DS node count is a timer stat for now	2013-07-02 16:41:46 -07:00
Stephen Birarda	c2076e8520	flip the audio-mixer-frame-time-usage back to STAT_TYPE_TIMER	2013-07-02 16:40:27 -07:00
ZappoMan	caff7dc9ab	Merge pull request #586 from birarda/opencv-warnings ... suppress warnings from OpenCV headers	2013-07-02 15:45:22 -07:00
Stephen Birarda	f2dbad4e57	resolve conflicts on merge with upstream master	2013-07-02 15:42:36 -07:00
ZappoMan	8d2aea5417	Merge pull request #611 from birarda/leap-error ... cmake fix for build error when leap library is missing	2013-07-02 15:40:03 -07:00
Stephen Birarda	1993601389	don't link a NOTFOUND leap library	2013-07-02 15:27:30 -07:00
Stephen Birarda	010e6e5570	Merge pull request #610 from birarda/domain-stats ... rename argument for Logstash stat stash	2013-07-02 15:05:18 -07:00
Stephen Birarda	11e06dbed2	rename the stat type argument in Logstash	2013-07-02 15:04:22 -07:00
Andrzej Kapolka	bf4757663c	Merge pull request #609 from birarda/domain-stats ... rework Logstash to handle various stat types, add domain server node count stat	2013-07-02 14:52:08 -07:00
Stephen Birarda	f7f321663a	DRY up multiple stat type sending	2013-07-02 14:42:31 -07:00
ZappoMan	147f090d56	Merge pull request #599 from PhilipRosedale/master ... 3P transition turned off, field of view now in preferences	2013-07-02 14:19:09 -07:00
ZappoMan	f36d7e7677	Merge pull request #607 from heracek/19385 ... Code Review for Job #19385	2013-07-02 14:16:13 -07:00
Tomáš Horáček	6f6f0423a0	Merge remote-tracking branch 'worklist/master' into 19385	2013-07-02 23:05:50 +02:00
Tomáš Horáček	a9f8b586ee	re #19385: CR changes	2013-07-02 23:04:06 +02:00
Stephen Birarda	08c1d54cf3	send count of alive nodes to logstash from DS	2013-07-02 12:18:16 -07:00
Stephen Birarda	64f3b55aaa	split logstash stash methods to stat types	2013-07-02 12:10:46 -07:00
Stephen Birarda	2a4d9c98ee	add return of number of alive agents from AgentList	2013-07-02 10:34:57 -07:00
Stephen Birarda	ef8c48245e	remove a couple of unused variables in the domain-server	2013-07-02 10:05:28 -07:00
Tomáš Horáček	5f9f2fee71	re #19385: use righ axis name	2013-07-02 11:47:53 +02:00
Philip Rosedale	e7113d26f8	Add field of view as an option in preferences	2013-07-01 23:00:39 -07:00
Philip Rosedale	6fbab462f0	Merge branch 'master' of https://github.com/worklist/hifi	2013-07-01 22:30:06 -07:00
Philip Rosedale	6a3833359e	Merge pull request #600 from tschw/19377 ... Code Review for Job #19377	2013-07-01 22:24:36 -07:00
tosh	f062319c2b	introduces named constants for bandwidth meter channel indices / max. drag length	2013-07-02 03:53:49 +02:00
Tomáš Horáček	66de431d67	re #19385: add hot-fix to allow import of big PNGs ... sendVoxelsOperation() is sending data too fast, printf slows it down. Better fix is required.	2013-07-02 02:57:55 +02:00
Tomáš Horáček	2eeb0d9bb9	re #19385: importing voxels should be destructive	2013-07-02 01:16:20 +02:00
Tomáš Horáček	71c54586ba	re #19385: use right neighbour voxels	2013-07-02 01:16:20 +02:00
Tomáš Horáček	b5e5806988	re #19385: fill gaps between neighbourhood voxels	2013-07-02 01:16:20 +02:00
Tomáš Horáček	c4c2d46847	re #19385: first version of PNG import ... works for size <= 128px	2013-07-02 01:16:20 +02:00
tosh	f49e63f842	Merge branch 'master' of git://github.com/worklist/hifi into 19377	2013-07-02 00:06:10 +02:00
tosh	7ebd912788	improves defaults and inline documentation of bandwidth meter layout constants	2013-07-01 23:38:00 +02:00
Stephen Birarda	818bfb0ba8	Merge pull request #605 from birarda/master ... add a license	2013-07-01 11:56:53 -07:00
Stephen Birarda	8129f0d028	add an all rights reserved license	2013-07-01 11:56:19 -07:00
Stephen Birarda	bdf5248d6a	Merge pull request #603 from birarda/master ... more podspec changes to avoid tagging	2013-07-01 09:45:37 -07:00
Stephen Birarda	dd37516ed6	remove specific glm version, don't specify commit	2013-07-01 09:45:11 -07:00
Stephen Birarda	3ee690b11d	Merge pull request #602 from birarda/master ... type squishes for podspec test	2013-07-01 09:39:15 -07:00
Stephen Birarda	3c51f9cac7	type squishes in Agent socket match	2013-07-01 09:38:39 -07:00
Stephen Birarda	8d5ddd7101	Merge pull request #601 from birarda/master ... provide version for glm dependency	2013-07-01 09:30:45 -07:00
Stephen Birarda	1a69364e8e	provide a version requirement for glm dependency	2013-07-01 09:30:17 -07:00
tosh	3f62edd68e	makes bandwidth details dialog properly close (and reopen) on ESC key	2013-07-01 10:53:49 +02:00
tosh	639858dfc9	Merge branch 'master' of git://github.com/worklist/hifi into 19377	2013-07-01 10:29:56 +02:00
tosh	98589adef5	Bandwidth meter: Bytes -> bits, number formatting (colors, digits, aligment) on dialog	2013-07-01 10:28:17 +02:00
Philip Rosedale	54826a4099	Merge pull request #596 from birarda/podspec ... add a podspec for inclusion to iOS app as pod	2013-06-30 23:27:40 -07:00
Philip Rosedale	138b8d7f64	Merge pull request #585 from birarda/owning-agent ... boolean helper for Avatar isMyAvatar check	2013-06-30 23:26:32 -07:00
Philip Rosedale	d464ae4158	Merge pull request #578 from birarda/fervor ... add an autoupdater for release OS X builds	2013-06-30 23:25:42 -07:00
tosh	fdf9f10e82	increases height of bandwidth meters by 8 pixels	2013-06-30 17:32:44 +02:00
tosh	f1e5a56347	adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars	2013-06-30 17:08:01 +02:00
tosh	435b958671	polishes bandwidth meter	2013-06-29 20:52:07 +02:00
tosh	46f8136f2e	combined bandwidth display at automatic scale	2013-06-29 20:30:12 +02:00