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
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
Sam Gondelman
b19376ef6e
trying to fix connexion linker errors, general style fixes, renamed some files
2015-07-30 12:17:36 -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
David Rowe
f0ed8d8cef
Add menu item that enables / disables simulated eye tracking
2015-07-28 14:07:25 -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
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
Andrew Meadows
7578a70c4c
Merge pull request #5359 from birarda/protocol
...
Network Protocol Refactor
2015-07-20 14:30:58 -07:00
Brad Davis
488a449cb1
Merge branch 'master' into homer
2015-07-20 13:34:21 -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
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
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
