Commit graph

599 commits

Author SHA1 Message Date
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
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
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
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
10ec36874f Remove Menu deprecated members 2015-01-17 17:59:24 -08:00
Atlante45
3fbc8c5d44 Moved Menu::shouldRenderMesh() to LODManager 2015-01-17 17:56:33 -08:00
Atlante45
a9047b7b15 LODManager class
Moved most LOD related members in menu to new Dependency
LODManager
	Replaced all Menu::getInstance() call that accessed those
members by DM gets
2015-01-16 17:55:47 -08:00
Atlante45
f34add9c9c Moved Bookmarks related funct out of Menu
Took everything Bookmarks related in Menu and moved it over to
Bookmarks.
2015-01-16 16:30:33 -08:00
Atlante45
0041d489cc Move stuf around in Menu for easier cleanup 2015-01-16 14:37:38 -08:00
Andrzej Kapolka
b6c843497d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-16 11:56:04 -08:00
Sam Gateau
d1fb071208 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:38:53 -08:00
Stephen Birarda
e538669343 resolve conflicts on merge with upstream 2015-01-15 13:12:05 -08:00
David Rowe
5195ae2424 Merge branch 'master' into 20269 2015-01-15 11:01:17 -08:00
David Rowe
91e321565a Change menu item text 2015-01-15 10:38:17 -08:00
Philip Rosedale
048d190350 Merge pull request #4108 from ctrlaltdavid/20263
CR for Job #20263 - Create a "Bookmarks" capability
2015-01-15 10:30:41 -08:00
David Rowe
544d412122 Add menu items that copy location address and location path
And Rename File > Go to File > Location
2015-01-15 09:33:35 -08:00
David Rowe
426cd71fc6 Persist bookmarks to file 2015-01-14 22:58:13 -08:00
David Rowe
da58d5a381 Delete Bookmark menu item and dialog box 2015-01-14 18:15:39 -08:00
Thijs Wenker
80a81043ed Merge branch 'master' of https://github.com/highfidelity/hifi into 20216
Conflicts:
	interface/src/Menu.cpp
2015-01-15 02:28:31 +01:00
Stephen Birarda
ef87b59a0c remove method declarations for location changes 2015-01-14 17:02:18 -08:00
Stephen Birarda
e5fe24e088 remove My Locations and Name This Location 2015-01-14 16:58:15 -08:00
David Rowe
a78ab5a5b3 Teleport to selected bookmark 2015-01-14 10:14:56 -08:00
David Rowe
fa6faa771a Add bookmarks with Bookmark Location menu item
The menu of bookmarks is kept sorted.
2015-01-13 22:39:16 -08:00
Atlante45
cf7089e145 Move constant back to Menu 2015-01-12 18:49:05 -08:00