10933 commits

Author	SHA1	Message	Date
Ryan Huffman	f44ec6da12	Set global font size in preferencesDialog	2015-02-18 12:49:11 -08:00
Ryan Huffman	18a92464b5	Remove custom font sizes on preferences dialog	2015-02-18 12:23:56 -08:00
Ryan Huffman	ab542c3599	Update DPI scaling to not update default fonts	2015-02-18 12:21:10 -08:00
Ryan Huffman	a5b737314d	Add auto-scale to preferences dialog	2015-02-18 11:44:15 -08:00
ZappoMan	1fc0225939	change ScriptCache and SoundCache to derive from Dependency	2015-02-13 15:33:41 -08:00
Andrew Meadows	5113258d72	Merge pull request #4279 from birarda/android ... fix cleanup of AudioClient, avoid gvr-interface crash on OS X	2015-02-13 10:58:50 -08:00
Brad Hefta-Gaub	1827d9f3cd	Merge pull request #4256 from samcake/temp1 ... Getting rid of glLIghts and replacing by the model::Light	2015-02-13 10:49:53 -08:00
Stephen Birarda	e3475d4d7f	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-02-13 10:19:00 -08:00
Andrew Meadows	d69efa03d8	Merge pull request #4276 from birarda/master ... repairs to memory management for AudioInjectors	2015-02-13 10:15:07 -08:00
Brad Hefta-Gaub	3531463978	Merge pull request #4265 from Triplelexx/#20300 ... #20300	2015-02-12 17:19:01 -08:00
Stephen Birarda	6c25205856	fix audio cleanup and close action in Application	2015-02-12 13:35:22 -08:00
Stephen Birarda	7becf62ba9	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-12 10:28:04 -08:00
Brad Hefta-Gaub	fa5eebd93e	Merge pull request #4269 from AndrewMeadows/thermonuclear ... ModelEntityItem gets _shapeType	2015-02-12 10:06:01 -08:00
Andrew Meadows	5553f0f531	Merge pull request #4275 from ctrlaltdavid/20306 ... CR for Job #20306 - When you load Interface on a PC if takes up the entire screen, this needs to change	2015-02-12 09:50:12 -08:00
Andrew Meadows	7304585103	Merge pull request #4271 from huffman/fix-overlays-text-size ... Fix overlays text size	2015-02-12 09:35:37 -08:00
David Rowe	6f03035169	Explicit casts for OSX and Linux	2015-02-11 18:05:25 -08:00
David Rowe	967afd8d67	Restore to windowed, maximized, or full screen appropriately at start-up	2015-02-11 16:13:04 -08:00
Stephen Birarda	7b485829c4	cleanup AudioInjector memory management	2015-02-11 15:52:00 -08:00
Andrew Meadows	9f59addbc2	merge upstream/master into andrew/thermonuclear	2015-02-11 13:35:28 -08:00
Ryan Huffman	a527bd85ba	Update Text3DOverlay::textSize to use new TextRenderer::getExtents	2015-02-11 12:13:26 -08:00
Seth Alves	a281695132	keep bandwidths stats visible even if stats are expanded	2015-02-11 11:35:52 -08:00
Seth Alves	62507721c7	put bandwidth stats in first overlay column rather than in their own	2015-02-11 11:05:44 -08:00
Ryan Huffman	d7e18d6f6d	Update TextOverlay::textSize to use new TextRenderer::getExtents	2015-02-11 11:04:04 -08:00
Andrew Meadows	68c1e9ef71	Merge pull request #4260 from birarda/master ... replace data with metaverse for highfidelity urls, allow optional gvr-interface build	2015-02-11 09:02:18 -08:00
Andrew Meadows	d9b57de649	merge upstream/master into andrew/thermonuclear	2015-02-11 08:56:34 -08:00
Triplelexx	e2f942c026	Coding standard fixes ... Corrected else format, removed additional comment to fit other declarations and break block.	2015-02-11 06:11:38 +00:00
Triplelexx	260f960ccc	Indentation correction ... Indention was still incorrect I believe. 😢	2015-02-11 03:49:28 +00:00
Triplelexx	837f8d71a4	Coding standard fixes ... Coding standard fixes Indentation and space missing	2015-02-11 03:17:28 +00:00
Triplelexx	84d7ae6b3a	Change conditional limit to >= ... edge case	2015-02-11 00:18:08 +00:00
Triplelexx	93366e068f	Remove all references to AUDIO_METER_INSET ... further cleaning	2015-02-11 00:16:40 +00:00
Triplelexx	d59ee7c561	Removed meter inset ... changes to bar color make the inset very visible	2015-02-10 23:57:09 +00:00
Triplelexx	e473661568	Fix meter showing out of bounds ... add conditional check for exception when audioLevel is NAN.	2015-02-10 23:55:56 +00:00
Triplelexx	8e0ac763eb	Changed color of audio bar background ... Worklist mentions: Additionally, change the color of the bar to #4CC1B8 / 76,193,184	2015-02-10 22:41:43 +00:00
Stephen Birarda	542283b4b2	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-10 12:25:12 -08:00
Brad Hefta-Gaub	d84398524b	Merge pull request #4258 from ctrlaltdavid/fix-windows-windowing ... Fix maximized Windows window unintentionally changing to windowed	2015-02-10 12:01:29 -08:00
Stephen Birarda	d2d7507903	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-10 10:53:53 -08:00
Stephen Birarda	fe79d8902e	replace data with metaverse for highfidelity urls	2015-02-10 10:05:38 -08:00
David Rowe	45c0d0e6a9	Fix Windows --url command line parameter handling	2015-02-09 23:50:43 -08:00
David Rowe	4fa2b3a6e9	Fix maximized Windows window unintentionally changing to windowed ... This stops a maximized Windows window changing to being windowed when you click on a menu item.	2015-02-09 22:07:12 -08:00
ZappoMan	2f981686fa	fix bad colors on windows	2015-02-09 15:38:50 -08:00
Sam Gateau	ed8d433ad5	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-09 15:27:06 -08:00
ZappoMan	ea33c66681	fix formating issue in performance stats	2015-02-09 15:04:43 -08:00
Andrew Meadows	e6a6946027	merge upstream/master into andrew/thermonuclear	2015-02-09 12:44:52 -08:00
David Rowe	468433e70a	Fix VSync menu item on Windows	2015-02-09 12:01:53 -08:00
Sam Gateau	ace6dc4faf	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-08 23:23:06 -08:00
Thijs Wenker	3ccbe50092	remove warnings for non-RSSDK builds	2015-02-07 19:07:10 +01:00
Thijs Wenker	c7b19277ee	rssdk fix missing constants	2015-02-07 13:40:51 +01:00
Brad Hefta-Gaub	ca0cf1f1f1	Merge pull request #4244 from birarda/binary-fonts ... move fonts to sdff bin files, load with qrc	2015-02-06 16:37:39 -08:00
Sam Gateau	469ee29f0b	Merge branch 'temp0' of https://github.com/samcake/hifi into temp1	2015-02-06 16:30:47 -08:00
Sam Gateau	bdf9164c7b	debugging the new global light pass	2015-02-06 16:30:07 -08:00