Commit graph

984 commits

Author SHA1 Message Date
Stephen Birarda
a961cd8ff3 show link to IRC in place of Qxmpp removal 2015-03-03 12:17:35 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
ZappoMan
9cc66f3da7 cleanup stats display behavior, reset default settings for timing details 2015-02-27 17:57:42 -08:00
David Rowe
8d9685ee39 Fix Face Tracking menu operation 2015-02-21 11:01:07 -08:00
David Rowe
24d03deb21 Fix typo 2015-02-18 15:02:44 -08:00
David Rowe
c446e72226 Add Face Tracking menu item to select the face tracker to use
Includes new DDE Face Regression option.
2015-02-18 12:39:51 -08:00
David Rowe
468433e70a Fix VSync menu item on Windows 2015-02-09 12:01:53 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Atlante45
09a9f82256 More settings update 2015-02-03 10:52:50 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Seth Alves
f0edba9a6b Start on refactoring of bandwidth metrics 2015-01-30 11:11:17 -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
d2af9a2911 have Application pass audio pos/orientation to AudioClient 2015-01-21 12:03:11 -08:00
Stephen Birarda
0eced09f1d intial removal of Audio to audio-client 2015-01-21 11:49:06 -08:00
Atlante45
2b3f12a7c4 More settings hooks 2015-01-20 16:52:42 -08:00
Atlante45
dc972df59d Fixed load/saveAction types 2015-01-19 16:44:54 -08:00
Atlante45
c1e195d17b Remove load/saveSettings from Menu/Application
Tweaked scanMenuBar too
2015-01-19 16:24:58 -08:00
Atlante45
43597ea29d Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
2015-01-19 14:18:22 -08:00
Atlante45
c2b7ff1b54 Totally removed Application's setting memember 2015-01-18 19:10:30 -08:00
Atlante45
293f2f7f01 Fix broken slot connection 2015-01-18 18:07:33 -08:00
Atlante45
e006ae34f7 Removed headers in Menu.cpp
Replaced with qApp in Menu
2015-01-18 07:31:47 -08:00
Atlante45
1f31828e08 Moved last methog out of Menu
Also did a bit of Header cleanup
2015-01-18 07:14:52 -08:00
Atlante45
e7a2b0296b Removed Menu::bumpSettings() 2015-01-18 06:57:59 -08:00
Atlante45
0e40a61eaa Removed unused method 2015-01-18 06:53:06 -08:00
Atlante45
8933da7bc7 Moved SpeechRecognizer out of Menu
Added it in the DM
2015-01-18 06:50:34 -08:00
Atlante45
7f702d3bff Removed loadRSSDKFile() from Menu 2015-01-18 06:31:55 -08:00
Atlante45
9e3b4c6834 Remove unused variable 2015-01-18 06:26:58 -08:00
Atlante45
3bce8204da Moved toggleSixense out of Menu
Moved into SixenseManager
2015-01-18 06:25:27 -08:00
Atlante45
8a827dbb3e Remove unneeded sendFakeEnterEvent() 2015-01-18 06:18:41 -08:00
Atlante45
17e0b0b551 Remove unused wallet private key for now 2015-01-18 06:16:57 -08:00
Atlante45
5930e06849 Moved Snapshot location out of Menu
Moved into Snapshot
2015-01-18 06:02:03 -08:00
Atlante45
488d8a03d5 Moved getShadowEnabled out of Menu
Moved to Application
2015-01-18 05:52:19 -08:00
Atlante45
df69466887 Moved copyPath/Address out of Menu
Moved into AddressManager
2015-01-18 05:48:14 -08:00
Atlante45
fdce0baee9 Removed vsync slot from menu 2015-01-18 05:39:53 -08:00
Atlante45
bac448af5d Mute mute slot out of Menu 2015-01-18 05:29:25 -08:00
Atlante45
90c3c7955a Moved chat out of Menu
Move into DialogsManager
	Done moving dialogs out of Menu!!!
2015-01-18 05:16:33 -08:00
Atlante45
c600a3b0b3 More dialog out of Menu (Almost there)
Moved into DialogsManager
2015-01-18 04:47:13 -08:00
Atlante45
8d483c9e6e Moved some more dialogs out of Menu
All moved into DialogsManager
2015-01-18 04:34:33 -08:00
Atlante45
afadb0b48c Moved more dialogs out of Menu
All moved into DialogsManager
2015-01-18 04:08:34 -08:00
Atlante45
05edbd68bf Moved OctreeStatsDialog out of Menu
Moved it into DialogsManager
2015-01-18 03:48:37 -08:00
Atlante45
fb8639b85c Moved AddressBar out of Menu
Moved into DialogsManager
2015-01-18 03:31:55 -08:00
Atlante45
8f9507cd4c Added DialogsManager
Moved login dialog out of menu into the dialog manager
	More to follow!
2015-01-18 03:31:44 -08:00
Atlante45
e8a396b08b Moved Octree max pps out of Menu
Moved it to OctreeQuery
2015-01-17 23:31:38 -08:00
Atlante45
21a3705b48 Added StandAloneJSConsole class
Moved _jsConsole out of Menu to a global class of it's own
2015-01-17 23:08:30 -08:00
Atlante45
bfceaf2838 Moved FieldOfView related members out of Menu
Moved them to ViewFrustum
2015-01-17 22:37:02 -08:00
Atlante45
b743a51fa0 Moved SixenseManager header from Menu .h to .cpp 2015-01-17 22:14:48 -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
3fbc8c5d44 Moved Menu::shouldRenderMesh() to LODManager 2015-01-17 17:56:33 -08:00