David Rowe
07c9a0e2bb
Add Developer > Crash Interface menu item
2015-08-24 10:48:58 -07:00
Thijs Wenker
0f8cf80d45
Merge branch 'master' of https://github.com/worklist/hifi into 20660
2015-08-23 19:53:50 +02:00
Thijs Wenker
748625399e
"View -> World Axes" menu option
2015-08-23 17:59:58 +02:00
Brad Davis
d3135dcfa6
Stereo rendering work
2015-08-22 16:15:10 -07:00
David Rowe
e9b3d48165
Add menu item that disables adjusting eyelids to follow pupil
...
Developer > Avatar > Disable Eyelid Adjustment
2015-08-20 16:10:31 -07:00
Seth Alves
940390ee46
make enable-avatar-collisions menu item work again
2015-08-18 19:31:05 -07:00
ZappoMan
6a802560f2
remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd
2015-08-14 16:27:50 -07:00
Howard Stearns
1133e053d1
Developer->Avatar->Fix Gaze menu option to not move the eyes around while we're debugging.
2015-08-14 07:33:36 -07:00
David Rowe
e6473fc8b9
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.h
tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
Brad Davis
caf93d1aff
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Menu.h
2015-08-08 13:18:13 -07:00
David Rowe
051a398fa2
Merge branch 'master' into 20639
2015-08-07 18:26:56 -07:00
ZappoMan
87f609b9af
remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows
2015-08-07 11:26:07 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
David Rowe
d7b42e264e
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-08-05 16:49:06 -07:00
David Rowe
3be2ddf234
Fix calibration menu item actions
2015-08-05 12:05:04 -07:00
Andrew Meadows
59f6988e56
Merge pull request #5465 from SamGondelman/connexionFixes
...
Trying to fix/clean up 3DConnexion stuff
2015-08-05 11:16:34 -07:00
David Rowe
fae26d901c
Add menu option to render look-at targets
2015-08-04 18:34:56 -07:00
David Rowe
c771574578
Add 5 point eye tracker calibration option
2015-08-04 18:02:34 -07:00
David Rowe
fefddb631f
Add 1 and 3 point eye tracker calibration
2015-08-04 14:46:03 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
Sam Gondelman
01c4e17236
trying to fix connexion linker errors, general style fixes, renamed some files
2015-08-01 11:41:29 -07:00
Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Sam Gondelman
b19376ef6e
trying to fix connexion linker errors, general style fixes, renamed some files
2015-07-30 12:17:36 -07:00
Brad Davis
5878a4661c
Restoring HMD tools dialog, phase 1
2015-07-30 11:35:55 -07:00
David Rowe
46b4817155
Add DDE option to couple eyelids
...
Use the most "open" value for both.
2015-07-29 20:08:58 -07:00
David Rowe
83ab37be0f
Merge branch 'master' into 20639
...
Conflicts:
interface/src/Menu.h
2015-07-29 19:46:01 -07:00
David Rowe
02ae008c9c
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-07-29 16:24:30 -07:00
Howard Stearns
838711e526
Remove avatar->shift hips for idle animations.
...
See https://app.asana.com/0/32622044445063/43127903156601
2015-07-29 15:27:50 -07:00
David Rowe
ed259e6bbb
Merge branch 'master' into 20639
2015-07-29 11:44:58 -07:00
Andrew Meadows
a1e6fdc4b2
Merge pull request #5435 from MarcelEdward/hifi-2-20069
...
Hifi 2 20069
2015-07-29 11:13:30 -07:00
Brad Davis
91768b3992
Merge pull request #5450 from SamGondelman/sam/input-plugins
...
Plugins branch - re-remove hand lasers
2015-07-28 16:25:55 -07:00
Brad Davis
ead9bbe866
Moving display plugins menu
2015-07-28 16:22:21 -07:00
David Rowe
f0ed8d8cef
Add menu item that enables / disables simulated eye tracking
2015-07-28 14:07:25 -07:00
SamGondelman
782a5c491e
removed hand lasers because they had been renamed so they weren't removed
2015-07-28 12:56:31 -07:00
Brad Davis
a049b14d13
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 10:04:19 -07:00
Brad Hefta-Gaub
43eec08514
Merge pull request #5376 from venkatn93/avatar
...
New ambient occlusion effect in render pipeline
2015-07-28 09:58:51 -07:00
David Rowe
8a7cdb1c64
Make Throttle FPS If Not Focus be enabled by default
2015-07-27 19:53:38 -07:00
Niraj Venkat
34e400ac67
Changing var name to 'DebugAmbientOcclusion'
2015-07-27 17:14:09 -07:00
David Rowe
e0ca6eb5ed
Add eye tracker class and menu item
2015-07-27 15:33:15 -07:00
Marcel Verhagen
32d0513962
The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351
...
For now without a merge conflict.
Updated the menu name.
Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
2015-07-27 19:04:49 +02:00
Bradley Austin Davis
0cbc12af8b
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-27 10:15:10 -04:00
Kevin M. Thomas
67c9a33cc0
Update Menu.cpp
2015-07-24 15:16:02 -04:00
Kevin M. Thomas
5f7fe30b9b
Merge branch 'master' of https://github.com/highfidelity/hifi into 20618
...
# Conflicts:
# interface/src/Menu.cpp
2015-07-24 15:10:34 -04:00
ZappoMan
720f6ec529
completely remove six sense lasers
2015-07-23 11:17:22 -07:00
SamGondelman
e3bc4b3b89
working on plugin menu manipulation
2015-07-21 13:45:33 -07:00
Brad Davis
5744200f64
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
SamGondelman
d985d0293a
correcting comments, removing dead code + back slash
2015-07-20 16:48:53 -07:00
Anthony J. Thibault
80dea6831c
Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers
...
Conflicts:
interface/src/Application.cpp
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-07-20 15:18:23 -07:00
Andrew Meadows
7578a70c4c
Merge pull request #5359 from birarda/protocol
...
Network Protocol Refactor
2015-07-20 14:30:58 -07:00
Brad Davis
9fafc920ee
Merge branch 'homer' into plugins
...
Conflicts:
interface/src/Application.cpp
libraries/render-utils/src/AmbientOcclusionEffect.cpp
2015-07-20 13:53:15 -07:00
Brad Davis
488a449cb1
Merge branch 'master' into homer
2015-07-20 13:34:21 -07:00
Brad Davis
359abd6474
Merge branch 'master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/GLCanvas.cpp
interface/src/GLCanvas.h
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
interface/src/devices/TV3DManager.cpp
interface/src/ui/overlays/LocalModelsOverlay.cpp
libraries/render-utils/src/OffscreenGlCanvas.cpp
libraries/render-utils/src/OffscreenGlCanvas.h
libraries/render-utils/src/text/EffectType.h
2015-07-20 13:33:24 -07:00
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29:38 -07:00
Brad Hefta-Gaub
c41e20b90f
Merge pull request #5366 from jherico/marge
...
Naked GL removal work
2015-07-20 12:12:22 -07:00
Brad Davis
dcaaeec593
Removing AO effect (temporarily) and wireframe mode
2015-07-20 10:55:11 -07:00
Stephen Birarda
6b11495a20
resolve conflicts on merge with upstream master
2015-07-20 08:51:48 -07:00
Brad Davis
35f7307f30
More header cleanup
2015-07-18 22:15:50 -07:00
Philip Rosedale
61c2b172d4
Merge pull request #5357 from ctrlaltdavid/scriptable-muting
...
Mute / un-mute face tracking when menu item is changed from script
2015-07-18 15:45:01 -07:00
David Rowe
7b11d02eb2
Default Throttle FPS to disabled
2015-07-18 14:18:08 -07:00
David Rowe
d0489bf2a0
Add menu item, Developer > Render > Throttle FPS If Not Focus
2015-07-18 14:18:06 -07:00
Anthony J. Thibault
01c740f415
cleaning up plugin architecture, fixed hand controllers
2015-07-17 17:19:49 -07:00
Stephen Birarda
54edc6f993
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-07-17 16:04:45 -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
David Rowe
550e9224c5
Mute / un-mute face tracking when menu item is changed from script
2015-07-17 11:45:15 -07:00
Stephen Birarda
e5722098f6
resolve conflicts on merge with upstream/master
2015-07-17 11:06:01 -07:00
Brad Davis
7f6bb552a3
Working on cleaning up diff
2015-07-16 20:51:37 -07:00
Anthony J. Thibault
e8da4b9586
merge with plugins, needs testing
2015-07-16 18:47:39 -07:00
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
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
Anthony J. Thibault
56e7af081e
input plugin architecture, fixed sixense
2015-07-15 18:50:44 -07:00
Kevin M. Thomas
671263909a
Moved reload content item to nested Network menu item.
2015-07-15 19:47:37 -04:00
Kevin M. Thomas
b93ae7b527
Move reload content item to developer menu.
2015-07-15 19:25:18 -04: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
bwent
70e3e7caa4
Merge branch 'master' into audioStatsDialog
2015-07-15 12:29:33 -07:00
bwent
2c24251b52
Clean up from previous commit
2015-07-15 11:41:26 -07:00
bwent
5b0b7229ba
Added a dialog box to display audio network statistics
2015-07-15 11:10:39 -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
Ryan Huffman
56b5c9acff
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
...
Conflicts:
assignment-client/src/entities/EntityServer.cpp
domain-server/src/DomainServer.cpp
2015-07-14 14:53:45 -07:00
Stephen Birarda
e2188415fe
fix ref to qApp, connection to audioIO
2015-07-14 14:45:26 -07:00
Stephen Birarda
4dd3dd6386
swap m for comma in Menu
2015-07-14 14:44:04 -07:00
Stephen Birarda
23548a99bc
move NACK packet disabling to EntityEditPacketSender
2015-07-14 14:43:01 -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
Atlante45
7bf45308b6
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-14 12:31:37 -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 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
Anthony J. Thibault
2ac6b6cd32
misc. changes
2015-07-09 09:57:12 -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
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
Sam Gondelman
f69b755166
merge with hifi/plugins
2015-07-06 17:41:45 -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
e421141ec5
experimenting with input plugins
2015-06-30 09:52:54 -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
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
b0eccc40c2
Fix crash cause when Menu::instance() is before offscreen ui startup
2015-04-27 22:58:09 -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
Brad Davis
d55d467d3f
Tweaking VR menu for PR
2015-04-27 11:35:57 -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
1ff8c67576
More work on menus and some code cleanup
2015-04-24 12:54:11 -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
Brad Hefta-Gaub
82d3302d1b
Merge pull request #4644 from jherico/offscreen
...
Working on new-UI implementations of address bar and login
2015-04-23 07:17:45 -07:00
