Andrew Meadows
2e99d316ac
remove JointState::_translation
...
(use corresponding data in FBXJoint instead)
2014-05-29 12:52:05 -07:00
Andrew Meadows
a898fcbf75
move details of getJointRotation() into JointState
...
also: remove unused getLeft/RightHandRotation() methods
2014-05-29 11:43:25 -07:00
Andrew Meadows
4cf5628783
move applyRotationDelta() from Model to JointState
2014-05-29 10:00:55 -07:00
Andrew Meadows
29e093e2e0
fix float literals to agree with coding standard
2014-05-29 09:20:01 -07:00
Andrew Meadows
86d6fd45de
safe copy of JointState data
2014-05-29 08:19:43 -07:00
Andrew Meadows
ec25982a58
add JointState::updateWorldTransform()
2014-05-28 17:51:17 -07:00
Andrew Meadows
b15b0fd96c
cleaner initialization of JointState
2014-05-28 17:31:07 -07:00
Andrew Meadows
9f2a4ae626
Make JointState a proper class
...
JointState gets a pointer to its corresponding FBXJoint
2014-05-28 16:49:39 -07:00
Andrew Meadows
e74da5f2a0
merge upstream/master into andrew/inertia
2014-05-28 14:55:08 -07:00
Andrew Meadows
13f11e1056
Remove "fromBind" arg in Model::setJointRotation
...
It was always set 'true'.
2014-05-28 14:53:32 -07:00
Andrzej Kapolka
4cbc550820
Fix arguments to applyRotationDelta.
2014-05-28 12:03:57 -07:00
Brad Hefta-Gaub
9546fe477c
Merge pull request #2940 from AndrewMeadows/inertia
...
fix for lack of neck rotations
2014-05-28 11:00:55 -07:00
barnold1953
ebfb11c1ce
Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory
2014-05-28 10:46:46 -07:00
Andrew Meadows
676a8882fe
fix for no neck motion
...
FaceModel needs similar override to updateJointState() as SkeletonModel
2014-05-28 10:43:21 -07:00
barnold1953
21fb18a92e
Fixed SkeletonModel compilation errors with PrioVR
2014-05-28 10:24:50 -07:00
barnold1953
35e63757ed
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-28 09:25:55 -07:00
matsukaze
619db8ee93
Job #19694 - Add option for larger number of frames to the audio scope display
2014-05-27 23:24:28 -04:00
Andrzej Kapolka
62eeeaa1c6
Fix for Windows build failure.
2014-05-27 18:12:15 -07:00
Andrzej Kapolka
222655d948
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 17:43:34 -07:00
Andrzej Kapolka
9796334160
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 17:26:56 -07:00
barnold1953
216a73cf60
Fixed coding standard issues
2014-05-27 16:40:51 -07:00
Andrew Meadows
d1a8c18d10
simplified hand index constants
2014-05-27 16:32:29 -07:00
barnold1953
2570c55241
Touched up comments
2014-05-27 16:21:34 -07:00
barnold1953
5665e4d278
Merge branch 'master' of https://github.com/highfidelity/hifi
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-05-27 16:16:27 -07:00
barnold1953
75580cfd0f
Made Overlay appear as flat image in front of camera in Oculus Rift. It
...
needs to be a curved surface instead.
2014-05-27 16:13:56 -07:00
Andrew Meadows
9f72d6ca3f
fix bug -- negate logic around invalid joint index
2014-05-27 15:53:20 -07:00
Andrew Meadows
ae3b792a35
move face/head code from Model into SkeletonModel
2014-05-27 15:28:41 -07:00
Andrew Meadows
6efa417742
move hand/arm stuff from Model to SkeletonModel
2014-05-27 15:06:50 -07:00
Andrew Meadows
afc7660d74
merge upstream/master into andrew/inertia
2014-05-27 14:57:44 -07:00
Andrew Meadows
f7b8c4f0a0
remove unused Head::_gravity data memeber
2014-05-27 14:50:17 -07:00
Andrzej Kapolka
2b54d627c0
Try rounding to nearest texel unit to reduce shimmer.
2014-05-27 14:25:27 -07:00
ZappoMan
c63c0c0ce3
Merge branch 'master' of https://github.com/worklist/hifi into aacube
2014-05-27 13:39:45 -07:00
ZappoMan
8ec14568fe
support ray picking against the AABB for the rotated model extents
2014-05-27 13:39:32 -07:00
Andrew Meadows
07544c7b43
removal of unused getNeckRotation()
2014-05-27 12:52:44 -07:00
Andrzej Kapolka
3f478b1939
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 12:31:12 -07:00
Andrzej Kapolka
ee00a86915
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 11:44:10 -07:00
Andrzej Kapolka
edaa251e5f
Provide option to disable avatar shadowing.
2014-05-27 11:43:34 -07:00
Mohammed Nafees
5055b18a4b
Merge branch master from upstream
2014-05-28 00:02:15 +05:30
barnold1953
d1a4192ac5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 11:20:23 -07:00
barnold1953
d4f66a4a3d
Added OverlayRenderer class and moved displayOverlay from Application to
...
OverlayRenderer.
2014-05-27 11:19:45 -07:00
Andrzej Kapolka
70ab33b65b
Some tricks to avoid shadow artifacts: render back faces to shadow buffer,
...
use polygon offset.
2014-05-27 10:54:18 -07:00
Brad Hefta-Gaub
13366d9ba1
Merge pull request #2926 from ctrlaltdavid/chat_window
...
Fix chat window scrolling
2014-05-27 10:07:34 -07:00
Brad Hefta-Gaub
d63374f656
Merge pull request #2927 from AndrewMeadows/inertia
...
Improved detection of floor surfaces
2014-05-27 09:33:50 -07:00
Andrew Meadows
9175ae20d6
Merge upstream/master into andrew/inertia
2014-05-26 16:26:15 -07:00
Andrew Meadows
51850076e4
more correct detection of floor surfaces
2014-05-26 16:24:47 -07:00
David Rowe
7c3d3976ee
Fix chat window scrolling to stay at bottom
...
Stay at bottom window when:
- There is new chat.
- People come and go from online list.
- Chat window hides and restores when application focus changes.
- Interface is minimized and restored.
2014-05-25 16:42:36 -07:00
David Rowe
97e5c928a4
Fix chat scroll bar widget jumping
...
Hovering over the chat window's scroll bar was causing it to jump
around. Replaced the 12px style spacing that was causing the problem
with a widget-based solution.
2014-05-25 16:41:01 -07:00
Kai Ludwig
78e311f885
separate style handling for chat area and its context menu.
2014-05-25 20:24:15 +02:00
Clément Brisset
6bb933996f
Merge pull request #2920 from ZappoMan/aacube
...
Add RayPick support for models
2014-05-24 17:03:59 -07:00
ZappoMan
a98ac0782a
CR feedback
2014-05-24 16:37:32 -07:00
