1094 commits

Author	SHA1	Message	Date
Brad Davis	ae882c8347	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/Menu.cpp interface/src/Menu.h interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp interface/src/ui/ApplicationCompositor.cpp interface/src/ui/overlays/LocalModelsOverlay.cpp	2015-07-16 16:37:55 -07:00
ZappoMan	849b584596	more GlowEctomy	2015-07-15 13:16:38 -07:00
ZappoMan	819fa852b8	first pass at GlowEctomy	2015-07-15 12:47:59 -07:00
ZappoMan	e39ea72daf	removed dead code	2015-07-14 21:25:49 -07:00
ZappoMan	f1b85aefa9	more dead code removal: NodeBounds	2015-07-14 17:59:20 -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
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
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
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	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	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	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
Andrew Meadows	7721f6de96	Merge pull request #5134 from birarda/master ... add goBack and goForward to AddressManager	2015-06-16 13:50:20 -07:00
Stephen Birarda	1af4b1c54c	cleanup handleUrl call, add disabling of Menu items	2015-06-16 13:17:13 -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
David Rowe	e16116ce78	Have auto mute mic upon losing camera tracking disabled by default	2015-06-12 12:33:42 -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 Hefta-Gaub	79023763ef	Merge pull request #4869 from ctrlaltdavid/20543 ... CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled	2015-05-20 14:47:31 -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	d3cb6a9334	Fix visibility of binary eyelid control menu item	2015-05-15 09:40:32 -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	8a3c8e0d9a	Merge branch 'master' into 20532 ... Conflicts: interface/src/devices/DdeFaceTracker.cpp	2015-05-12 17:41:12 -07:00
David Rowe	667ad9b0cb	Add menu option to enable/disable binary webcam eyelid control	2015-05-11 17:11:51 -07:00
David Rowe	9f6bc080c9	Default face tracking to Use Camera for first-time users ... First time start up with face tracking enabled.	2015-05-08 17:45:21 -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	9974eb0357	Merge branch 'master' into plugins	2015-05-08 10:49:28 -07:00
David Rowe	0eeff526d5	Add shortcut key for face tracker muting	2015-05-07 08:51:59 -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
David Rowe	35dbb9491c	Merge branch 'master' into 20518	2015-05-05 13:13:49 -07:00
Thijs Wenker	9a6e442b25	Fix for RealSense menu item ... This was missed while moving to the new MenuWrapper class.	2015-05-04 18:07:48 +02:00
Brad Davis	d8415ce79b	Working on display plugins	2015-05-01 15:14:50 -07:00