Philip Rosedale
|
57e2f71bb7
|
remove unused body delta pitch, roll
|
2014-12-02 23:24:47 -08:00 |
|
Philip Rosedale
|
3ca20a7eee
|
Add jump/warp turning when in HMD
|
2014-12-02 23:08:34 -08:00 |
|
Atlante45
|
4d5451fafe
|
Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/SkeletonModel.cpp
|
2014-11-19 17:28:24 -08:00 |
|
Atlante45
|
ae3bcc8f06
|
No more .f
|
2014-11-19 16:53:39 -08:00 |
|
Andrew Meadows
|
6673d9d0c2
|
avatar stands on lowest toe
|
2014-11-19 09:13:24 -08:00 |
|
Philip Rosedale
|
6af2b7aadf
|
remove buckyballs and face shift lean driving (should be a script if desired)
|
2014-11-12 07:33:59 -08:00 |
|
David Rowe
|
8e58e6e3b0
|
Remove unused methods
|
2014-10-31 12:48:30 -07:00 |
|
Andrew Meadows
|
c1728c0296
|
Merge upstream/master into andrew/experimental
|
2014-10-27 10:08:48 -07:00 |
|
Philip Rosedale
|
4e605f5f67
|
First headMove "no-barf" version with lean/nod to walk, turn
|
2014-10-21 00:20:08 -07:00 |
|
Andrew Meadows
|
01a3eaa26b
|
added experimental MyAvatar.setSkeletonOffset()
for improved walk animations
|
2014-10-05 19:10:55 -07:00 |
|
Stephen Birarda
|
7c738edbd8
|
Merge pull request #3488 from PhilipRosedale/master
Correct eye contact for Oculus users
|
2014-09-26 15:42:03 -07:00 |
|
AndrewMeadows
|
7f7861671e
|
Merge pull request #3471 from ctrlaltdavid/20055
Code Review for Job #20055
|
2014-09-26 14:00:33 -07:00 |
|
David Rowe
|
aa9511c263
|
Position Rift camera at avatar model's mid-eye location
|
2014-09-25 22:49:12 -07:00 |
|
Philip Rosedale
|
1d4b86d85b
|
Blink first with one eye and at slightly different speeds, look back and forth exactly at eyes when receiving gaze in Oculus
|
2014-09-25 16:00:56 -07:00 |
|
Philip Rosedale
|
75e536235c
|
Avatars look at your camera, not your avatar. Improvements to lookAt code
|
2014-09-24 14:38:44 -07:00 |
|
Andrzej Kapolka
|
aeb424cd71
|
Fix for billboards.
|
2014-09-22 15:01:39 -07:00 |
|
Andrzej Kapolka
|
8d3eef708a
|
Move various avatar render bits to post-lighting section.
|
2014-09-19 13:13:05 -07:00 |
|
Andrew Meadows
|
8359e672bb
|
merge upstream/master into andrew/ragdoll
|
2014-09-17 17:56:35 -07:00 |
|
Andrew Meadows
|
cefe8e0268
|
scripted motor params are now Q_PROPERTIES
|
2014-09-17 17:55:10 -07:00 |
|
Andrew Meadows
|
489871d0d6
|
added MyAvatar.setMotorVelocity() & friends for JS
|
2014-09-16 17:09:32 -07:00 |
|
Stephen Birarda
|
0033dfe5af
|
use quat orientation to store locations and user locations
|
2014-09-16 09:57:21 -07:00 |
|
Andrew Meadows
|
b2432876ce
|
More reliable floor detection for avatar movement.
Also tweaked max walking speed.
|
2014-09-15 13:53:37 -07:00 |
|
Andrew Meadows
|
f2882618be
|
merge upstream/master into andrew/inertia
Conflicts:
interface/src/avatar/MyAvatar.cpp
|
2014-09-12 17:50:26 -07:00 |
|
Andrew Meadows
|
62867391a3
|
collide against PhysSimulation instead of VoxelTree
|
2014-09-12 17:38:45 -07:00 |
|
Brad Hefta-Gaub
|
b209b70094
|
Merge pull request #3404 from birarda/data-web-domain-lookup
initial transition to new metaverse API
|
2014-09-12 13:45:40 -07:00 |
|
Brad Hefta-Gaub
|
fc33de28a0
|
Merge pull request #3399 from huffman/19831
Code Review for Job #19831
|
2014-09-12 13:45:20 -07:00 |
|
Stephen Birarda
|
348bcdb37a
|
resolve conflicts on merge with upstream master
|
2014-09-12 11:23:16 -07:00 |
|
Stephen Birarda
|
745edb8b0a
|
fix error handling for location naming
|
2014-09-12 09:10:47 -07:00 |
|
Andrew Meadows
|
645d573772
|
merge upstream/master into andrew/inertia
Conflicts:
interface/src/Application.cpp
|
2014-09-12 07:37:30 -07:00 |
|
Stephen Birarda
|
7964180905
|
handle place creation at new API endpoint
|
2014-09-11 17:33:01 -07:00 |
|
Andrew Meadows
|
93864ee869
|
fix velocity drift of MyAvatar
|
2014-09-11 15:03:11 -07:00 |
|
Stephen Birarda
|
de24842cf0
|
fix stuck drive keys for Avatar when modifier released
|
2014-09-11 11:48:26 -07:00 |
|
Ryan Huffman
|
4315d63fb5
|
Merge branch 'master' of github.com:highfidelity/hifi into 19831
|
2014-09-11 11:13:13 -07:00 |
|
Stephen Birarda
|
71f2c0b542
|
initial addition of the AddressManager with location switch hooked up
|
2014-09-11 10:14:00 -07:00 |
|
Andrew Meadows
|
15025bf8d8
|
fix for flickering avatars
|
2014-09-08 13:08:08 -07:00 |
|
Andrew Meadows
|
ff09a0d41b
|
merge upstream/master into andrew/inerita
|
2014-09-05 11:47:49 -07:00 |
|
Andrew Meadows
|
7be411b4ca
|
expose _measured_ MyAvatar velocity to JS
|
2014-09-05 11:44:13 -07:00 |
|
Ryan Huffman
|
e590f992f6
|
Merge branch 'master' of git://github.com/highfidelity/hifi into 19831
|
2014-09-05 10:18:02 -07:00 |
|
Andrew Meadows
|
e120697a9b
|
merge upstream/master into andrew/ragdoll
|
2014-09-03 15:49:32 -07:00 |
|
Andrew Meadows
|
2c1aa31d1e
|
give MyAvatar a VoxelShapeManager member
|
2014-09-03 13:19:41 -07:00 |
|
ZappoMan
|
2bcad6ab2b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
|
2014-08-28 21:19:56 -07:00 |
|
Atlante45
|
a9d3355f2e
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-08-21 15:34:08 -07:00 |
|
Atlante45
|
f207abdd98
|
Move Player over to AvatarData for ACs to use
|
2014-08-21 15:24:19 -07:00 |
|
Clément Brisset
|
6a6670a962
|
Merge pull request #3307 from AndrewMeadows/inertia
JS scripts can set spine rotation
|
2014-08-21 11:07:39 -07:00 |
|
AndrewMeadows
|
ff9f079704
|
Merge pull request #3308 from Atlante45/record_feature
Record feature Scripted UI
|
2014-08-21 09:56:02 -07:00 |
|
Atlante45
|
022109a249
|
Added timestamps to the scripted UI
|
2014-08-20 19:36:56 -07:00 |
|
Andrew Meadows
|
7e4c72445e
|
JS scripts set joint animation priorities
|
2014-08-20 17:14:59 -07:00 |
|
Clément Brisset
|
c76afe7d4a
|
Merge pull request #3298 from PhilipRosedale/master
First cut of Spacebar-to-fly with Oculus and Faceshift, stabilize Faceshift head jittering
|
2014-08-20 10:16:25 -07:00 |
|
Atlante45
|
b028b845f4
|
Fox audio recording not being triggerred from JS
|
2014-08-19 17:22:05 -07:00 |
|
Atlante45
|
b13604f968
|
JS API for recording
|
2014-08-19 16:43:26 -07:00 |
|