681 commits

Author	SHA1	Message	Date
Anthony J. Thibault	060f6c19a6	almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly	2015-07-16 18:16:59 -07:00
Anthony J. Thibault	aa66691a73	Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers	2015-07-14 12:37:09 -07:00
Anthony J. Thibault	dbc18ce51f	merge with plugins	2015-07-14 12:30:47 -07:00
Anthony J. Thibault	9209e0745e	Added "Standing HMD Sensor Mode" checkbox to menu ... removed static bool isRoomTracking and instead moved into the View menu.	2015-07-14 12:12:38 -07:00
Brad Davis	f8144e4ee2	Merge branch 'master' into plugins	2015-07-13 19:52:53 -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
Anthony J. Thibault	d75353eeb2	added left/right hand click actions, vive controller should be able to emulate mouse events	2015-07-07 14:35:55 -07:00
Brad Davis	95000eec3c	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/ui/overlays/LocalModelsOverlay.cpp	2015-07-06 16:22:03 -07:00
ZappoMan	74733452da	some tweaks to make stats dialog more readable	2015-07-04 11:25:27 -07:00
Brad Davis	2a1776303d	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp	2015-07-03 06:17:35 -07:00
Brad Davis	d5fe6f0bdb	Inhibiting log spam unless a menu item is selected	2015-07-02 12:34:32 -07:00
Brad Davis	d8dad5b86f	Fixing bad merge	2015-06-26 17:17:56 -07:00
Brad Davis	4417c00ae4	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.h interface/src/Menu.h	2015-06-26 17:02:16 -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 Davis	967fc62da7	Working on syncing with master	2015-06-22 13:46:03 -07:00
Brad Davis	9f98547390	Merge branch 'master' into plugins	2015-06-22 13:35:40 -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
Brad Davis	1b7efe9a02	Working on display plugins	2015-06-05 00:00:57 -07:00
Brad Davis	2758718c8d	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/ui/DialogsManager.cpp interface/src/ui/DialogsManager.h	2015-05-29 16:50:59 -07:00
Stephen Birarda	61029fd0b1	add ability to display domain connection times	2015-05-26 15:22:25 -07:00
Brad Davis	c0d84cfc54	Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp	2015-05-21 11:04:06 -07:00
Brad Davis	7f2552c690	Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.cpp interface/src/ui/PreferencesDialog.cpp	2015-05-16 22:38:15 -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
Bradley Austin Davis	230d1701b4	Merge remote-tracking branch 'upstream/master' into plugins	2015-05-08 17:14:39 -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	77a9f7fa2a	Merge branch 'plugins_pt1' into plugins	2015-05-06 14:22:13 -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
Brad Davis	d8415ce79b	Working on display plugins	2015-05-01 15:14:50 -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