Commit graph

10948 commits

Author SHA1 Message Date
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
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