11024 commits

Author	SHA1	Message	Date
Andrew Meadows	2519f66037	Merge pull request #4311 from huffman/application-dpi-scale ... Application dpi scale	2015-02-23 09:43:12 -08:00
Clément Brisset	c6b1375863	Merge pull request #4322 from AndrewMeadows/thermonuclear ... workaround for scratchy audio on Windows	2015-02-23 07:18:30 -08:00
Ryan Huffman	e6d9a1b251	Merge branch 'master' of github.com:highfidelity/hifi into application-dpi-scale ... Conflicts: interface/src/ui/LoginDialog.cpp	2015-02-20 18:09:55 -08:00
David Rowe	3a95614ca4	Update Faceshift readme.txt with Windows instructions	2015-02-20 11:29:51 -08:00
Andrew Meadows	aa667464c0	merge upstream/master into andrew/thermonuclear	2015-02-20 08:26:51 -08:00
Andrew Meadows	599ef68df8	fix for scratchy audio on windows	2015-02-20 08:26:11 -08:00
Ryan Huffman	4dfe725721	Update preferences dialog to use layouts throughout	2015-02-19 14:02:15 -08:00
Ryan Huffman	4a8e3193a9	Add more comments to UIUtil::scaleWidgetFontSizes	2015-02-19 12:01:27 -08:00
Jason Hawks	d0b47a66ab	removed at symbol and added enter for teleport box	2015-02-19 14:49:00 -05:00
Clément Brisset	d2ed782626	Merge pull request #4308 from Triplelexx/20315 ... CR for Job #20315 - Update contents of the "welcome to Interface" dialog	2015-02-19 10:27:27 -08:00
Andrew Meadows	21405135f9	Merge pull request #4310 from talentraspel/20323 ... CR for Job #20323 - BUG: another crash on exit in interface	2015-02-19 09:52:23 -08:00
Ryan Huffman	a8999964f6	Cleanup dpi scaling comments	2015-02-18 16:21:51 -08:00
Ryan Huffman	4751974c45	Revert "Add scaling for high-dpi Windows/Linux displays" ... This reverts commit 2828b65bea.	2015-02-18 16:16:50 -08:00
Ryan Huffman	03eb1a984f	Revert "Fix dpi scaling in getViewportDimensions" ... This reverts commit 9b719273ab.	2015-02-18 16:15:53 -08:00
Ryan Huffman	22d46e3e6b	Update runningscripts script font to match parent	2015-02-18 15:33:24 -08:00
Ryan Huffman	9b719273ab	Fix dpi scaling in getViewportDimensions	2015-02-18 15:30:39 -08:00
Ryan Huffman	2828b65bea	Add scaling for high-dpi Windows/Linux displays	2015-02-18 15:09:41 -08:00
Ryan Huffman	51f5719e0f	Update font sizes in running scripts window	2015-02-18 14:59:52 -08:00
Ryan Huffman	b2e1d8a38c	Remove font scaling based on system DPI	2015-02-18 14:37:56 -08:00
Ryan Huffman	7dab39a2f1	Add qDebug message to scaleWidgetFontSizes	2015-02-18 14:16:33 -08:00
Ryan Huffman	ff1fb07b2d	Add high-dpi support to scaleWidgetFontSizes	2015-02-18 14:04:02 -08:00
Ryan Huffman	4a383ff177	Update font sizes in running scripts panel	2015-02-18 13:56:41 -08:00
Ryan Huffman	a069a2f21c	Add default font to running scripts window	2015-02-18 13:34:48 -08:00
Ryan Huffman	e048f7a36c	Add font scaling to running scripts window	2015-02-18 13:34:28 -08:00
Ryan Huffman	9550339a2a	Move preferences dialog font scaling to UIUtil	2015-02-18 13:34:01 -08:00
Ryan Huffman	ba66155d46	Add font scaling to login dialog	2015-02-18 13:33:39 -08:00
Ryan Huffman	0d60c09d03	Add UI font scaling to UIUtil	2015-02-18 13:33:19 -08:00
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
Kai Ludwig	d659ac573a	now all application timers should get stopped correctly on exit	2015-02-18 19:53:45 +01:00
Clément Brisset	6e5c3593b6	Merge pull request #4298 from talentraspel/20339 ... removed id "g3322" in start-script.svg because it is no longer used and ...	2015-02-18 06:13:35 -08:00
Clément Brisset	3f117ce322	Merge pull request #4293 from AndrewMeadows/thermonuclear ... fix crash in AudioScope for bad memory access	2015-02-18 06:03:03 -08:00
Triplelexx	1bcb3f7c75	Merge remote-tracking branch 'upstream/master' into 20315	2015-02-17 20:45:44 +00:00
Triplelexx	ffc6a6883e	Add images to welcome page ... Replaced SVG placeholder items with images in interface-welcome.html.	2015-02-17 20:45:01 +00:00
Seth Alves	dd64eeb282	fix uninitialized geometry cache id in Line3DOverlay	2015-02-17 11:47:29 -08:00
Andrew Meadows	9895df6e7e	merge upstream/master into andrew/thermonuclear	2015-02-17 10:05:36 -08:00
Andrew Meadows	53855c89e9	Merge pull request #4289 from birarda/dependencies ... add gverb and glm as cmake external projects	2015-02-17 10:00:29 -08:00
Kai Ludwig	0de598586c	removed id "g3322" in start-script.svg because it is no longer used and causes a "link rect899 hasn't been detected!" message on script editor open.	2015-02-17 18:37:23 +01:00
Andrew Meadows	bc664435e7	Merge pull request #4296 from thoys/20318 ... CR for Job #20318 - BUG: Login menu item not popping up	2015-02-17 09:28:53 -08:00
Andrew Meadows	dba206337b	Merge pull request #4294 from thoys/20348 ... CR for Job #20348 - Change audio meter background back to white	2015-02-17 09:24:05 -08:00
Andrew Meadows	d896f3a811	Merge pull request #4252 from thoys/20224 ... CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads	2015-02-17 09:03:17 -08:00
Thijs Wenker	4a3550ce0e	toggleQAction(); in constructor to make the right initial button connection	2015-02-17 02:27:07 +01:00
Thijs Wenker	42e4eee15e	audio meter background "back in black" / "paint it black"	2015-02-16 23:14:27 +01:00
Andrew Meadows	57797329d1	do sample size arithmetic before scaling by sizeof	2015-02-16 12:14:03 -08:00
Stephen Birarda	8acaa062a2	Merge pull request #4281 from Atlante45/fix_mute_environnement ... Fix mute environnement	2015-02-16 09:11:47 -08:00
Brad Hefta-Gaub	9b6049489b	Merge pull request #4280 from AndrewMeadows/inertia ... remove a couple crash modes on shutdown	2015-02-13 17:11:56 -08:00
Brad Hefta-Gaub	2f492082c1	Merge pull request #4287 from sethalves/fix-Rectangle3d-drawing-problem ... fix Rectangle3d drawing problem	2015-02-13 16:30:46 -08:00
Andrew Meadows	9122364c3b	merge upstream/master into andrew/inertia	2015-02-13 16:20:09 -08:00