David Rowe
e06f28b7c5
Merge branch 'master' into 20422
...
Conflicts:
examples/users.js
interface/src/Application.cpp
2015-03-31 21:01:54 -07:00
David Rowe
cbf2012bf5
Add menu items that set visibility
...
And synchronize visibility settings between Interface and users.js.
2015-03-29 18:35:56 -07:00
ZappoMan
80df8caefb
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI
2015-03-28 18:43:03 -07:00
David Rowe
be69c0b58f
Add add/remove friends menu item
...
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
2015-03-28 13:05:23 -07:00
Andrew Meadows
be5fdbf217
enable avatar collisions by default
...
also remove old gravity features
2015-03-27 13:36:20 -07:00
ZappoMan
6189926105
add type hint to FST in model packager
2015-03-27 13:23:29 -07:00
ZappoMan
6cff99f9d6
menu and display tweaks
2015-03-26 16:36:46 -07:00
ZappoMan
fa122a227b
tweaks to the LOD Tools UI
2015-03-23 16:44:07 -07:00
Atlante45
bcfd4b50be
Merge branch 'master' of https://github.com/highfidelity/hifi into package_models
2015-03-12 14:18:37 +01:00
Seth Alves
48aca5c46f
Merge pull request #4423 from AndrewMeadows/isentropic
...
remove old ragdoll simulation and avatar interactions
2015-03-11 15:18:15 -07:00
Andrew Meadows
feafa0a60b
remove old Ragdoll and avatar interactions
2015-03-11 14:29:03 -07:00
David Rowe
32897de80a
Rename Stereo Audio menu item
2015-03-11 12:41:47 -07:00
Atlante45
9b80c01357
Remove ModelUploader from the menu
2015-03-11 16:21:36 +01:00
Atlante45
f4d8ee39dc
Menu item for cache editor
2015-03-05 21:10:02 +01:00
ZappoMan
5c3c94a618
remove metavoxels
2015-03-02 17:21:43 -08:00
ZappoMan
9cc66f3da7
cleanup stats display behavior, reset default settings for timing details
2015-02-27 17:57:42 -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
Atlante45
09a9f82256
More settings update
2015-02-03 10:52:50 -08:00
Seth Alves
f0edba9a6b
Start on refactoring of bandwidth metrics
2015-01-30 11:11:17 -08:00
Atlante45
2b3f12a7c4
More settings hooks
2015-01-20 16:52:42 -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
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