Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 11:42:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20760 commits 71 branches 56 tags 1.2 GiB
Commit graph

945 commits

Author SHA1 Message Date
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
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
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
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
52876ecb16 Fix merge 2015-01-15 10:07:51 -08:00
David Rowe
95efe9857b Merge branch 'master' into 20263 2015-01-15 09:52:19 -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
ebe80075dc Tidy 2015-01-14 23:20:47 -08:00
David Rowe
426cd71fc6 Persist bookmarks to file 2015-01-14 22:58:13 -08:00
David Rowe
d9bd7f019f Simplify bookmark handling 2015-01-14 22:20:45 -08:00
David Rowe
1ffe22d5e9 Sanitize bookmark names 2015-01-14 18:31:54 -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
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
01f7efe767 Remove ellipsis from Collide With menu item 
Noticed in passing.
 2015-01-13 22:48:05 -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
476e2124b7 Moved DM::get() calls to auto 2015-01-13 20:51:02 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Clément Brisset
5635ac3d7b Merge pull request #4090 from ctrlaltdavid/no-show-voxel-nodes 
Remove menu item for Show Voxel Nodes which is no longer available
 2015-01-13 17:06:58 -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
Atlante45
934d8d58ef Move some constants out of Menu class files 2015-01-12 16:03:15 -08:00
Atlante45
e30b119464 Some simple code cleanup 2015-01-12 15:55:25 -08:00
Atlante45
59c9e0bb50 Wire CachesSizeDialog in Menu 2015-01-12 15:19:36 -08:00
Atlante45
7bf57b3cca Removed unecessary method/cleanup header 2015-01-12 14:53:31 -08:00
Atlante45
e62fbe2557 Cleanup some headers 2015-01-12 14:09:26 -08:00
Atlante45
894c4c9d59 All dialogs in Menu are QPointers 2015-01-12 14:00:23 -08:00
David Rowe
022760be1d Remove menu item for Show Voxel Nodes which is no longer available 
And change Show Entity Nodes shortcut from Ctrl-Shift-2 to Ctrl-Shift-1.
 2015-01-12 11:52:51 -08:00
Brad Hefta-Gaub
ddea2c4a68 Merge pull request #4058 from huffman/entity-tool-updates 
Entity tool updates
 2015-01-07 12:42:47 -08:00
Ryan Huffman
b471c1fa71 Update hotkey for audio stats 2015-01-07 12:15:53 -08:00
Brad Hefta-Gaub
8ad21d61c4 Merge pull request #4056 from huffman/audio-buffer-starvation-detection 
Audio buffer starvation detection
 2015-01-07 11:18:34 -08:00
Ryan Huffman
40f277b630 Fix use of dependency manager 2015-01-07 10:20:49 -08:00