Anthony J. Thibault
0c489e3afd
MyAvatar: Rename new instance variable after merge.
2015-10-09 14:46:05 -07:00
Anthony J. Thibault
b5ba621f78
Merge branch 'master' into tony/hmd-rest-detection
2015-10-09 14:36:18 -07:00
Howard Stearns
700835a6d1
Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset
2015-10-09 13:13:22 -07:00
Howard Stearns
652376db8a
Kill the stuff we can't do yet.
2015-10-08 21:44:45 -07:00
Brad Hefta-Gaub
e1b69a1704
Merge pull request #6022 from jherico/lisa
...
Fix mouse events for entity scripts
2015-10-07 20:43:41 -07:00
Brad Davis
50592a87a6
Fix mouse events for entity scripts
2015-10-07 19:44:08 -07:00
Howard Stearns
bd0d1eaef6
Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset
2015-10-07 18:35:52 -07:00
Brad Hefta-Gaub
a86e34f9f9
Merge pull request #6018 from hyperlogic/tony/avatar-mixer-stats-improvements
...
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
2015-10-07 16:04:13 -07:00
Andrew Meadows
ef58238c66
Merge pull request #6017 from ZappoMan/animationGroupSettings
...
fix a bunch of warnings
2015-10-07 15:50:20 -07:00
Brad Hefta-Gaub
ae93c020be
Merge pull request #5994 from Atlante45/display_name
...
Display name in terms of arc size not pixels
2015-10-07 15:40:30 -07:00
Anthony J. Thibault
0cebeb7fe9
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
...
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
2015-10-07 15:32:10 -07:00
Brad Hefta-Gaub
c6d50af085
Merge pull request #5999 from AndrewMeadows/save-sixense-settings
...
Save hydra calibration settings
2015-10-07 15:27:06 -07:00
Atlante45
fb284448b5
Raise display name not to collide with heads
2015-10-07 15:21:35 -07:00
Atlante45
efeeaa7ea7
Make display names 25% smaller
2015-10-07 15:14:06 -07:00
Atlante45
14a1860670
Do not change keyhole radius
2015-10-07 14:55:18 -07:00
Atlante45
fd6f0213ef
CR
2015-10-07 14:55:18 -07:00
Atlante45
79b280f733
Update getDisplayNamePosition debug
2015-10-07 14:55:18 -07:00
Atlante45
91b46203f3
Don't take keyhole into account
2015-10-07 14:55:17 -07:00
Atlante45
946d289a99
Display name have a arc size instead of pixel size
2015-10-07 14:55:17 -07:00
Brad Hefta-Gaub
bfd014203e
fix a bunch of warnings
2015-10-07 14:48:42 -07:00
Andrew Meadows
0680be0422
save sixense settings and some UI cleanup
2015-10-07 14:19:15 -07:00
Andrew Meadows
039d9a6a98
Merge pull request #6010 from ZappoMan/disableHandMouseByDefault
...
Disable hand mouse by default
2015-10-07 14:15:58 -07:00
Thijs Wenker
ad5a6fac62
- applying of new qApp accessing method.
...
- Some magic constant replacements with Helper "glm::vec3(matrix[3])" -> "extractTranslation(matrix)"
2015-10-07 15:10:40 +02:00
Thijs Wenker
4ab5e0af84
Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation
...
Conflicts:
interface/src/scripting/HMDScriptingInterface.h
2015-10-07 14:48:06 +02:00
Brad Hefta-Gaub
05fd62ac51
Merge pull request #6009 from jherico/homer
...
Enabling programmatic access to the IPD scale
2015-10-07 01:43:10 -07:00
Brad Davis
eff5a4c395
Picking fixes in the HMD
2015-10-06 22:56:48 -07:00
Howard Stearns
1fc305ca6b
Update HMD-derived avatar stuff during reset, update position under head, and remove unused vars.
2015-10-06 20:51:53 -07:00
Anthony J. Thibault
2dabe69341
When HMD is at rest, re-center the body under the avatar.
...
This should help the case when a user avatar is stuck in an
uncomfortable pose for a long period of time. If they stop
moving their head, the body should recenter itself and
appear more natural.
Added an AtRestDetector class. That tracks the average and variance
of both position and rotation (quaternion logarithms), then
detects when the variance falls under a threshold.
Also, renamed variables with the straighting prefix to straightening.
2015-10-06 20:37:51 -07:00
Brad Davis
028935f831
Removing deprecated function usage
2015-10-06 20:36:55 -07:00
Brad Hefta-Gaub
6e5847bb1c
make Hand Input Mouse off by default
2015-10-06 19:58:25 -07:00
Brad Davis
bac69c73a8
Fixing bug in application compositor transform
2015-10-06 19:08:44 -07:00
Brad Davis
19fb4e92a6
Enabling programmatic access to the IPD scale
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/scripting/HMDScriptingInterface.cpp
interface/src/scripting/HMDScriptingInterface.h
2015-10-06 19:08:17 -07:00
Thijs Wenker
6e52fcb857
Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation
...
Conflicts:
interface/src/scripting/HMDScriptingInterface.h
2015-10-07 03:11:24 +02:00
Brad Hefta-Gaub
02bb372c27
Merge pull request #6008 from AndrewMeadows/ik-targets-use-model-frame
...
IK targets specified in the skeleton's model-frame
2015-10-06 17:34:42 -07:00
Andrew Meadows
224fc55033
put IK targets in skeleton's model-frame
2015-10-06 16:49:29 -07:00
Atlante45
76e0006732
Remove forgotten cursorVisible
2015-10-06 15:58:35 -07:00
Howard Stearns
db955d894f
Align avatar body to head on reset.
2015-10-06 14:52:53 -07:00
Atlante45
8a7871e15b
rebase fix
2015-10-06 14:13:28 -07:00
Atlante45
ed13c02075
Fix rebase
2015-10-06 13:57:51 -07:00
Atlante45
c745050dea
Fix QObject::connect warning
2015-10-06 13:57:51 -07:00
Atlante45
7b25c9d417
More header cleanup
2015-10-06 13:57:50 -07:00
Atlante45
775994f9d0
Fix for 3DConnection
2015-10-06 13:57:49 -07:00
Atlante45
b63df98b8b
More unused
2015-10-06 13:57:49 -07:00
Atlante45
17edd38cb9
Remove unused variables
2015-10-06 13:57:48 -07:00
Atlante45
39e0d0e1dc
Put timers on the stack
2015-10-06 13:56:26 -07:00
Atlante45
e9b7125894
Misc cleanup
2015-10-06 13:56:26 -07:00
Atlante45
5e9425d9eb
Fix view frustum preference
2015-10-06 13:56:25 -07:00
Atlante45
60ebd3a544
Remove unused members (Mostly mouse stuff)
2015-10-06 13:56:25 -07:00
Atlante45
35e2f8cd89
Removed _myAvatar from Application
2015-10-06 13:56:25 -07:00
Atlante45
2fc80e58b6
Fix warning
2015-10-06 13:56:24 -07:00
