ZappoMan
a89691fc66
switch GLCanvas back to being owned by Application
2015-02-25 12:11:35 -08:00
Ryan Huffman
a8999964f6
Cleanup dpi scaling comments
2015-02-18 16:21:51 -08:00
Ryan Huffman
9550339a2a
Move preferences dialog font scaling to UIUtil
2015-02-18 13:34:01 -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
Stephen Birarda
30afadc7b7
fixes for new settings API
2015-02-04 10:53:05 -08:00
Stephen Birarda
11f3161029
resolve conflicts on merge with upstream/master
2015-02-04 10:38:05 -08:00
Atlante45
27459ba861
Settings update
2015-02-03 12:27:30 -08:00
Atlante45
647a935eaa
Remove app->getAvatar
2015-01-29 15:16:40 -08:00
Atlante45
4ef87b9919
Merge branch 'master' of https://github.com/highfidelity/hifi into android
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/ui/PreferencesDialog.cpp
interface/src/ui/Stats.cpp
libraries/audio-client/src/AudioClient.cpp
libraries/audio-client/src/AudioClient.h
2015-01-28 13:13:32 -08:00
Stephen Birarda
f885dc229b
final fixes for Audio includes in Interface
2015-01-21 12:31:10 -08:00
Stephen Birarda
0eced09f1d
intial removal of Audio to audio-client
2015-01-21 11:49:06 -08:00
Atlante45
cdb0c22207
interface/ui uses new settings
2015-01-19 22:49:27 -08:00
Atlante45
c2b7ff1b54
Totally removed Application's setting memember
2015-01-18 19:10:30 -08:00
Atlante45
8933da7bc7
Moved SpeechRecognizer out of Menu
...
Added it in the DM
2015-01-18 06:50:34 -08:00
Atlante45
5930e06849
Moved Snapshot location out of Menu
...
Moved into Snapshot
2015-01-18 06:02:03 -08:00
Atlante45
afadb0b48c
Moved more dialogs out of Menu
...
All moved into DialogsManager
2015-01-18 04:08:34 -08:00
Atlante45
e8a396b08b
Moved Octree max pps out of Menu
...
Moved it to OctreeQuery
2015-01-17 23:31:38 -08:00
Atlante45
bfceaf2838
Moved FieldOfView related members out of Menu
...
Moved them to ViewFrustum
2015-01-17 22:37:02 -08:00
Atlante45
47babc2d40
Move Sixense related members out of Menu
...
Moved to SixenseManager
2015-01-17 22:09:29 -08:00
Atlante45
ef5cfdc3ab
Move Faceshift related member out of Menu
...
Moved it to Faceshift class
2015-01-17 21:35:25 -08:00
Atlante45
8f5f634308
Took audio settings out of Menu
...
Hooked to actual settings in Audio class
2015-01-17 21:22:02 -08:00
Atlante45
229791a9f2
Move Oculus UI ratio to ApplicationOverlay
2015-01-17 19:45:48 -08:00
Atlante45
476e2124b7
Moved DM::get() calls to auto
2015-01-13 20:51:02 -08:00
Atlante45
2a82ff9768
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
Ryan Huffman
40f277b630
Fix use of dependency manager
2015-01-07 10:20:49 -08:00
Ryan Huffman
d113b3f85c
Update getAudio() calls to use DependencyManager instead
2015-01-07 09:48:41 -08:00
Ryan Huffman
a07d92b6ea
Merge branch 'master' of github.com:highfidelity/hifi into audio-buffer-starvation-detection
...
Conflicts:
interface/src/Audio.cpp
interface/src/Audio.h
interface/src/Menu.cpp
interface/src/ui/PreferencesDialog.cpp
2015-01-07 09:46:07 -08:00
Ryan Huffman
08776aec9d
Add output starve settings to preferences
2015-01-07 09:37:17 -08:00
Philip Rosedale
413cbacbc1
Merge pull request #4043 from ZappoMan/voxelEctomy
...
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 10:07:38 -08:00
ZappoMan
b940dcfdb3
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 09:27:48 -08:00
Stephen Birarda
51bba4884f
resolve conflicts on merge with upstream master
2015-01-05 14:40:48 -08:00
Ryan Huffman
defb2cbffd
Merge branch 'master' of git://github.com/highfidelity/hifi into audio-buffer-size
...
Conflicts:
interface/src/Audio.cpp
2015-01-05 14:07:06 -08:00
Ryan Huffman
0d71d25063
Add min/max for audio buffer size
2015-01-02 17:02:44 -08:00
Ryan Huffman
4c5bb66bd7
Add audio output buffer size to preferences
2015-01-02 16:01:04 -08:00
ZappoMan
141e231958
more work on voxelEctomy
2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309
first major pass at voxelEctomy
2014-12-30 18:08:58 -08:00
Atlante45
296c0025de
Switched to auto and changed macro
2014-12-18 15:42:38 -08:00
Stephen Birarda
7beb3a7b62
resolve conflicts on merge with upstream master
2014-12-17 16:57:35 -08:00
Atlante45
4d1529f77b
typedefs
2014-12-16 14:02:22 -08:00
Stephen Birarda
6fd55e6f42
make Audio class use DependencyManager
2014-12-16 12:31:01 -08:00
Atlante45
e5e2eb4e8a
Moved GLCanvas in DM and DM to QSharedPointers
2014-12-15 16:20:52 -08:00
Atlante45
25df784f43
Headers cleanup
2014-12-15 10:56:42 -08:00
Brad Hefta-Gaub
1c4e71ebc1
Revert "Worklist #20074 "
2014-10-30 14:33:10 -07:00
Pete
8d97a20bd9
Worklist #20074
...
- Add new Preferences item for Oculus Max FPS, defaults to 75, range is
[30, 95]
- Load and save this value appropriately
- When VR mode is enabled/disabled, set the Render Target Framerate to
this value/unlimited
2014-10-26 21:14:20 -07:00
AndrewMeadows
49af620665
Merge pull request #3393 from ey6es/master
...
shared TextRenderer instances; hostname for Faceshift connection
2014-09-11 09:20:47 -07:00
Andrzej Kapolka
7b3d06a783
Add option to change Faceshift hostname.
2014-09-10 19:34:21 -07:00
David Rowe
6d5f645299
Limit avatar head and body models in preferences to FST files (or blank)
2014-09-08 15:57:20 -07:00
stojce
3339b92a49
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964
2014-09-05 07:45:55 +02:00
Ryan Huffman
d54dc5f2aa
Merge branch 'master' of github.com:highfidelity/hifi into 19935
...
Conflicts:
interface/src/Menu.h
2014-09-04 12:05:17 -07:00
