Howard Stearns
a6395a2351
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-22 12:29:27 -07:00
Howard Stearns
dbb4a8b767
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-22 11:40:25 -07:00
Sam Gateau
f70553ec95
Fixing merge
2015-07-22 11:31:46 -07:00
Sam Gateau
7ac2030862
Preparing for first pr
2015-07-22 10:43:50 -07:00
Brad Hefta-Gaub
6dbe6bc375
Merge pull request #5332 from ctrlaltdavid/20612
...
Fix full-screen mirror not mirroring correctly with Faceshift or DDE
2015-07-21 13:32:56 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29:38 -07:00
Howard Stearns
9623ccf792
Change instantiation of Rig.
2015-07-20 11:07:25 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Stephen Birarda
f8c832e50b
resolve conflicts on merge with upstream master
2015-07-17 16:48:46 -07:00
Seth Alves
d287817829
give SkeletonModel created by MyAvatar a Rig pointer
2015-07-17 14:52:37 -07:00
Seth Alves
bcd6b30ec3
move AnimationHandle from render-utils to animation. give Rig some jointstates and animation lists
2015-07-17 13:31:48 -07:00
Brad Davis
89faf85ad9
Working on text rendering overlays
2015-07-16 15:56:01 -07:00
Stephen Birarda
05dde9d8f5
resolve conflicts on merge with upstream/master
2015-07-15 16:18:47 -07:00
David Rowe
fc0ae17a87
Mirror head when using face tracker in fullscreen mirror
...
Mirror translation, yaw, and roll in the same manner as done for HMD
case, to mimic what you would expect to see in a mirror.
2015-07-15 07:27:55 -07:00
David Rowe
0af62ca946
Convert tabs to spaces
2015-07-15 07:27:54 -07:00
ZappoMan
8bb6616a25
remove nakedGL from skeleton IK constraint rendering
2015-07-14 18:47:35 -07:00
ZappoMan
5a927c4c90
remove dead code
2015-07-14 18:25:50 -07:00
Atlante45
fbb6a94579
Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol
2015-07-14 16:36:28 -07:00
Atlante45
bbb00b9d3a
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
2015-07-14 14:11:41 -07:00
Stephen Birarda
821c16cbc4
resolve conflicts on merge with uptream/master
2015-07-14 09:52:20 -07:00
Atlante45
c80df94b06
Update includes for moved files
2015-07-13 15:28:55 -07:00
Stephen Birarda
ca1ff9b0f5
fix a couple of compile errors for avatar changes
2015-07-13 13:34:36 -07:00
Stephen Birarda
859122db5d
update signature of callbacks for avatar packets
2015-07-13 13:32:46 -07:00
Stephen Birarda
264f39fa59
resolve conflicts on merge with upstream/master
2015-07-13 11:25:24 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Seth Alves
d197bf2a85
use palm rotation data in hold action
2015-07-09 12:18:32 -07:00
Seth Alves
08d63b7fd8
first attempt at palm rotation
2015-07-09 11:03:02 -07:00
Stephen Birarda
da3502eb6c
resolve conflicts on merge with upstream/master
2015-07-08 18:41:48 -07:00
Stephen Birarda
cf15cbc62f
fix a cast, move a packet
2015-07-08 18:37:25 -07:00
Stephen Birarda
dfa5be1a0c
fix for killPacket in MyAvatar and DatagramProcessor header check
2015-07-08 18:35:04 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
David Rowe
87ca7626d7
Merge branch 'master' into 20601
2015-07-02 15:45:32 -07:00
David Rowe
9efeda9716
Adjust gaze target for someone looking at me
2015-07-02 15:43:23 -07:00
David Rowe
3a92878544
Reinstate making someone looking at me look at my camera instead of face
2015-07-02 13:47:52 -07:00
Clément Brisset
b616fff222
Merge pull request #5220 from howard-stearns/avatar-collision-sounds
...
Avatar collision sounds
2015-07-02 10:27:24 -07:00
David Rowe
c20cd40275
Merge branch 'master' into 20601
...
Conflicts:
interface/src/avatar/Head.cpp
2015-07-02 09:51:47 -07:00
Howard Stearns
d0675c7f22
Side-effect new value before emit.
2015-07-02 09:56:02 -05:00
David Rowe
026f6d3690
Add mouth as third gaze target in addition to left and right eyes
2015-07-01 21:22:30 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
Atlante45
ee13407066
Fix smart pointer casts
2015-07-01 19:22:40 -07:00
David Rowe
bc4c635106
Fix gazing at avatar (when no head tracking or HMD)
...
Randomly look at avatar's left and right eyes if the face is visible.
Otherwise just look at their head.
2015-07-01 18:31:16 -07:00
Brad Hefta-Gaub
af932fde29
Merge pull request #5247 from ericrius1/handRender
...
Fixed broken rendering of hydra visualization paraphernalia
2015-07-01 16:21:32 -07:00
ericrius1
f49f368ec3
removed dead commented out code
2015-07-01 15:16:34 -07:00
ericrius1
8b00864175
hydra hand spheres and lasers are rendering again
2015-07-01 15:04:19 -07:00
Philip Rosedale
8ed4000560
Merge pull request #5239 from SamGondelman/zooming
...
DO NOT MERGE - quadratic zooming response
2015-07-01 12:22:23 -07:00
Sam Gondelman
c9d205de3e
quadratic zooming response
2015-06-30 14:04:43 -07:00
Howard Stearns
98f165f2ae
Avatar collision sounds.
...
collisionsSoundURL can be set in preferences:
Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav .
Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
2015-06-26 16:23:16 -07:00
