Commit graph

675 commits

Author SHA1 Message Date
Brad Davis
488a449cb1 Merge branch 'master' into homer 2015-07-20 13:34:21 -07:00
Brad Davis
dcaaeec593 Removing AO effect (temporarily) and wireframe mode 2015-07-20 10:55:11 -07:00
David Rowe
d0489bf2a0 Add menu item, Developer > Render > Throttle FPS If Not Focus 2015-07-18 14:18:06 -07:00
Brad Hefta-Gaub
2df75f8bff Merge pull request #5337 from bwent/audioStatsDialog
Added a dialog box to display Audio Network Statistics
2015-07-17 14:45:51 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
bwent
70e3e7caa4 Merge branch 'master' into audioStatsDialog 2015-07-15 12:29:33 -07:00
bwent
5b0b7229ba Added a dialog box to display audio network statistics 2015-07-15 11:10:39 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
Brad Hefta-Gaub
049419cec7 Merge pull request #5307 from howard-stearns/remove-octreeFades
Remove old octreeFade code that wasn't working anyway
2015-07-14 10:24:01 -07:00
David Rowe
59f456a2f2 Add an "is looking at me" indicator above avatars' heads
Menu item: Developer > Avatar > Show Who's Looking at Me
2015-07-13 14:16:39 -07:00
Howard Stearns
51be245159 Remove old octreeFade code that wasn't working anyway. 2015-07-10 16:55:45 -07:00
Atlante45
ec7e1df8c0 Move and rename menu item 2015-07-10 15:47:46 -07:00
Atlante45
ed296850e2 Rename to clear cache and restart 2015-07-08 12:24:45 -07:00
Atlante45
39cb5100a3 Clear cache and restart first draft 2015-07-08 12:23:22 -07:00
ZappoMan
74733452da some tweaks to make stats dialog more readable 2015-07-04 11:25:27 -07:00
Brad Davis
d5fe6f0bdb Inhibiting log spam unless a menu item is selected 2015-07-02 12:34:32 -07:00
Sam Gondelman
56944afd39 avatar doesn't move in independent mode, alphabetized menu options 2015-06-25 12:36:36 -07:00
Sam Gondelman
19ec080e2b Merge with master 2015-06-24 15:04:03 -07:00
Sam Gondelman
824c219fa0 started fixing camera mode issue 2015-06-23 09:26:38 -07:00
Brad Hefta-Gaub
a7a53d8be7 Merge pull request #5148 from SamGondelman/rotationModes
center player in view mode
2015-06-18 18:02:47 -07:00
Stephen Birarda
8e46043f14 add fixed back/forward, buttons to menu 2015-06-16 08:41:21 -07:00
Sam Gondelman
22961fcc9d added camera mode to keep player in center of view 2015-06-15 15:44:56 -07:00
Stephen Birarda
61029fd0b1 add ability to display domain connection times 2015-05-26 15:22:25 -07:00
David Rowe
ff7b2016b4 Add option to auto mute microphone after lose face tracking 2015-05-14 08:50:43 -07:00
David Rowe
667ad9b0cb Add menu option to enable/disable binary webcam eyelid control 2015-05-11 17:11:51 -07:00
Brad Hefta-Gaub
a517e773f4 Merge pull request #4786 from ctrlaltdavid/20530
CR for #20530 - Add DDE calibration
2015-05-08 16:25:02 -07:00
Bradley Austin Davis
c31d36be59 Fixing scale resolution issues 2015-05-07 12:01:56 -07:00
David Rowe
afce981d83 Merge branch 'master' into 20530
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/DdeFaceTracker.cpp
	interface/src/devices/DdeFaceTracker.h
2015-05-06 16:27:33 -07:00
Bradley Austin Davis
4c22e637d7 Merge remote-tracking branch 'upstream/master' into off_axis 2015-05-06 11:28:03 -07:00
Bradley Austin Davis
c832fd969a Removing off-axis projection from menu 2015-05-06 11:26:46 -07:00
David Rowe
91a06ea3c4 Add "Calibrate Camera" menu item for DDE face tracking 2015-05-05 21:15:32 -07:00
David Rowe
d053379831 Add "Mute Face Tracking" menu item 2015-04-30 23:14:21 -07:00
Andrew Meadows
5a388a0c14 Merge pull request #4722 from birarda/avatar-mixer-debug
add option to display AvatarData receive stats with display name
2015-04-29 10:00:24 -07:00
Brad Hefta-Gaub
7414201845 Merge pull request #4721 from ctrlaltdavid/20514
DO NOT MERGE - QA for 20514 - Move "Stereo Audio" option into developerMenu.js
2015-04-28 20:44:09 -07:00
Stephen Birarda
f9a25d7089 add Menu option to toggle Avatar receive stats 2015-04-28 18:27:54 -07:00
David Rowe
9576ad19a7 Move "Stereo Audio" option into developerMenu.js
And rename it "Stereo Input" to better relect what it does.
2015-04-28 14:14:10 -07:00
Brad Davis
59b8b80148 Merge remote-tracking branch 'upstream/master' into vr_menus
Conflicts:
	interface/src/Menu.cpp
2015-04-27 16:02:13 -07:00
Seth Alves
e007617112 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 09:56:24 -07:00
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Brad Davis
1d316a1872 Still working on menus 2015-04-23 23:41:09 -07:00
Brad Davis
f17387fab4 Working on menus 2015-04-23 21:23:21 -07:00
Brad Davis
8cb298a55b Working on menus 2015-04-23 14:23:15 -07:00
David Rowe
35e2b87a70 Rename DDE menu items 2015-04-22 13:15:57 -07:00
David Rowe
649d4736cd Merge branch 'master' into dde-miscellaneous 2015-04-22 13:00:40 -07:00
David Rowe
1af17fa9e7 Use voice to control DDE mouth
Add voice blend coefficient values to DDE values.
2015-04-20 16:14:36 -07:00
Clément Brisset
b64d7fc17c Merge pull request #4662 from birarda/remove-visage
remove visage support
2015-04-20 20:06:21 +02:00
David Rowe
8268dc95ac Include DDE reset in sensors reset 2015-04-20 10:28:17 -07:00
Stephen Birarda
6b615c1ba1 remove Visage from menu header 2015-04-17 14:28:20 -07:00
David Rowe
931c46345e Move visibility methods into DiscoverabilityManager 2015-04-17 14:15:50 -07:00
David Rowe
6b085ca668 Move method out of Menu class 2015-04-17 10:53:04 -07:00