10806 commits

Author	SHA1	Message	Date
David Rowe	9e34b36839	Send hifi command line url to other instance	2015-02-05 17:17:31 -08:00
David Rowe	ab758648c7	Show and focus on the other Interface instance	2015-02-05 16:44:26 -08:00
David Rowe	1fa50fa54d	Run only one instance of Windows Interface at a time ... OSX automatically does this.	2015-02-05 13:09:06 -08:00
Clément Brisset	6a4577b6a5	Merge pull request #4231 from ZappoMan/crashonexit ... BUG FIXES: Crash on Exit with partially loaded scene & (near)-infinite loop in skipForward physics	2015-02-04 16:16:56 -08:00
Brad Hefta-Gaub	af91eee5a0	Merge pull request #4220 from sethalves/rework-bandwidth-meter ... fix several signed/unsigned comps, avoid sprintf in overlay code	2015-02-04 16:06:22 -08:00
Brad Hefta-Gaub	8311d1a00a	Merge pull request #4228 from ctrlaltdavid/20279 ... CR for Job #20279 - Tools > Audio device selection doesn't work on Windows	2015-02-04 13:59:14 -08:00
ZappoMan	4061e14c2d	move static members of ResourceManager into DependencyManager	2015-02-04 13:24:37 -08:00
Seth Alves	bcf0846310	merge from master	2015-02-04 11:30:22 -08:00
Seth Alves	a645d784d8	uint32_t rather than uint, which mac doesn't like	2015-02-04 11:26:05 -08:00
Brad Hefta-Gaub	de58c4a007	Merge pull request #4217 from Atlante45/master ... Fix for fps bug/field of view	2015-02-03 19:13:52 -08:00
Brad Hefta-Gaub	01f594b535	Merge pull request #4221 from AndrewMeadows/bispinor ... proof Andrew has a working Windows build on his laptop	2015-02-03 19:07:01 -08:00
Brad Hefta-Gaub	b9ee1294fa	Merge pull request #4216 from ctrlaltdavid/20281 ... Fix orientation of non-solid rectangle3d overlays, too	2015-02-03 18:52:51 -08:00
Andrew Meadows	35cbc9a41d	pass FBXGeometry by const reference ... this fixes a bug on windows about misaligned data in function call	2015-02-03 18:40:55 -08:00
Seth Alves	3d23446dcb	remove a couple more sprintfs	2015-02-03 17:21:41 -08:00
Seth Alves	c97eb20d69	avoid use of sprintf in overlay code	2015-02-03 17:11:10 -08:00
Atlante45	578ab1a9f2	Leave LOD settings as globals	2015-02-03 16:13:13 -08:00
Seth Alves	8489ee04f3	fix a couple of signed vs unsigned comparisons.	2015-02-03 16:11:04 -08:00
Atlante45	875507aaaa	Missing return	2015-02-03 15:58:24 -08:00
David Rowe	8297bbd5e7	Fix orientation of non-solid rectangle3d overlays, too	2015-02-03 15:52:20 -08:00
Atlante45	375d9eed5b	Fix QTimer warning	2015-02-03 15:22:52 -08:00
David Rowe	d9e353e498	Merge branch 'master' into 20280 ... Conflicts: libraries/networking/src/LimitedNodeList.h	2015-02-03 14:46:27 -08:00
Brad Hefta-Gaub	b5e62922a2	Merge pull request #4215 from huffman/edit-changes ... A few improvements to editEntities.js	2015-02-03 13:55:59 -08:00
Brad Hefta-Gaub	81871abd06	Merge pull request #4214 from ctrlaltdavid/20281 ... Fix orientation of rectangle3d overlays to match other 3D overlays	2015-02-03 13:54:19 -08:00
Atlante45	78a9d002db	Remove settings from InboundAudioStream	2015-02-03 12:47:25 -08:00
Atlante45	27459ba861	Settings update	2015-02-03 12:27:30 -08:00
Ryan Huffman	ba5a96f541	Add Window.setFocus	2015-02-03 11:44:22 -08:00
David Rowe	7f7cba8a1b	Fix orientation of rectangle3d overlays to match other 3D overlays	2015-02-03 10:54:16 -08:00
Atlante45	aacf61609f	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-03 10:53:44 -08:00
Atlante45	09a9f82256	More settings update	2015-02-03 10:52:50 -08:00
Seth Alves	0fa1273cc9	draw background behind bandwidth overlay stats	2015-02-03 10:51:20 -08:00
Atlante45	fdade344a3	Move Audio to new settings	2015-02-03 10:15:11 -08:00
Philip Rosedale	6483df69a4	Merge pull request #4209 from sethalves/rework-bandwidth-meter ... Consolidate Network Bandwidth Metrics	2015-02-03 09:05:28 -08:00
Ryan Huffman	13ea8ddb9e	Add missing _texture to BillboardOverlay copy ctor	2015-02-03 08:52:58 -08:00
Atlante45	cc58cb0f03	Update domain-server and Application setting handles	2015-02-02 20:06:13 -08:00
Atlante45	1e64fc84e8	Moved startup Application info settings load out of Application	2015-02-02 17:19:54 -08:00
Seth Alves	3fdf05ff77	coding standard	2015-02-02 15:36:18 -08:00
Seth Alves	82b8595af8	coding standard	2015-02-02 15:34:08 -08:00
Seth Alves	c1ae98fa1a	quiet some compiler warnings about signed vs unsigned comparisons	2015-02-02 15:02:29 -08:00
Seth Alves	8e64417607	formatting and cleanups	2015-02-02 12:21:46 -08:00
Seth Alves	4377105410	formatting and cleanups	2015-02-02 12:13:54 -08:00
Seth Alves	779a0086c4	BandwidthRecorder no longer knows about channel displays. cause overlay pps and Mbps to only update once per second	2015-02-02 11:56:50 -08:00
David Rowe	6e82679997	Permanently re-enable audio selection on Windows	2015-02-02 11:19:11 -08:00
Seth Alves	f1cca2ac92	move bandwidth stats display details out of recorder class into dialog class	2015-02-02 09:26:09 -08:00
Seth Alves	c0a219678c	use DependencyManager to keep track of BandwidthRecorder	2015-02-02 08:55:55 -08:00
Seth Alves	b85456b1e9	refactoring, cause BandwidthDialog to only update numbers once per second	2015-02-02 05:28:28 -08:00
Seth Alves	fc07ecf83d	use BandwidthRecorder rather than recompute Mbps and pps in Application	2015-01-31 20:40:18 -08:00
Seth Alves	bee895ba0a	capture network bandwidth stats from NodeList rather than various places	2015-01-31 20:02:04 -08:00
Seth Alves	77582f50df	Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter	2015-01-31 10:53:33 -08:00
Seth Alves	97035b6cd9	move some magic numbers to constants	2015-01-31 07:42:01 -08:00
Atlante45	1cfd98b2d7	Name threads	2015-01-31 00:50:12 -08:00