Andrzej Kapolka
3f08504e3e
Replaced missing functionality.
2014-01-16 12:39:07 -08:00
Andrzej Kapolka
2c7b6b9696
Skeleton removal checkpoint; compiles, but there are a few bits missing.
2014-01-15 15:14:50 -08:00
Brad Hefta-Gaub
170dbe6e85
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
domain-server/src/DomainServer.cpp
interface/src/Audio.cpp
interface/src/DataServerClient.cpp
interface/src/Oscilloscope.cpp
interface/src/PairingHandler.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Faceshift.cpp
interface/src/devices/SerialInterface.cpp
interface/src/renderer/FBXReader.cpp
libraries/avatars/src/AvatarData.h
libraries/octree-server/src/OctreeServer.cpp
libraries/octree-server/src/OctreeServer.h
libraries/octree/src/ViewFrustum.cpp
libraries/shared/src/Logging.cpp
libraries/shared/src/Node.cpp
libraries/shared/src/Node.h
libraries/shared/src/NodeList.cpp
libraries/shared/src/NodeList.h
libraries/shared/src/PerfStat.cpp
libraries/shared/src/SharedUtil.cpp
libraries/voxels/src/VoxelTree.cpp
voxel-edit/src/main.cpp
2014-01-15 10:20:21 -08:00
Stephen Birarda
6b2f72f14d
repair reference to _targetScale in MyAvatar
2014-01-14 16:17:07 -08:00
Stephen Birarda
599e3bb9e5
resolve conflicts on merge with upstream master
2014-01-14 16:15:58 -08:00
Stephen Birarda
274989935d
resolve conflicts on merge with upstream master
2014-01-14 16:09:12 -08:00
Stephen Birarda
767a241105
Merge remote-tracking branch 'upstream/master' into nodelist-container
2014-01-14 16:08:58 -08:00
Stephen Birarda
8676ac38f9
foreach spacing and reference repairs
2014-01-14 15:54:09 -08:00
Stephen Birarda
4ea14a51fc
remove the SerialInterface
2014-01-14 13:14:15 -08:00
Stephen Birarda
7d1a64ca8c
change NodeList container to QHash with QSharedPointer
2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
392ff94ebe
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
...
Conflicts:
interface/src/DataServerClient.cpp
interface/src/avatar/MyAvatar.cpp
libraries/avatars/src/AvatarData.h
2014-01-13 15:06:26 -08:00
Stephen Birarda
42e3bcfe91
allow fade scale to get smaller than minimum avatar scale
2014-01-13 13:52:41 -08:00
Brad Hefta-Gaub
55babbf7b6
windows type mismatch warning fixes
2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
825c1c8876
fix windows warnings
2014-01-11 00:07:35 -08:00
Brad Hefta-Gaub
73c8dc495b
changed all fmin to std::min
2014-01-10 21:42:08 -08:00
Andrzej Kapolka
4ae5203f38
Remove unused constant.
2014-01-10 14:10:33 -08:00
Andrzej Kapolka
9fa170494c
I believe what we really want to decay is the mouse pitch.
2014-01-10 14:04:46 -08:00
Andrzej Kapolka
8b2212b6cf
Fix for "red ball" issue with no skeleton: use avatar position for head
...
position.
2014-01-06 12:08:42 -08:00
Andrzej Kapolka
2b15fdf78f
Merge branch 'master' of https://github.com/worklist/hifi
2014-01-03 17:49:34 -08:00
Andrzej Kapolka
aa9fc290a5
Minimum chat circle radius from Ryan, basic avatar/voxel orbit behavior.
2014-01-03 16:46:11 -08:00
Andrew Meadows
6518e70688
Minor cast enforcement during initialization.
2014-01-03 16:27:57 -08:00
Andrew Meadows
1882c9e43b
Merge branch 'elasticity' of https://github.com/PhilipRosedale/hifi into elasticity-fix
...
Conflicts:
libraries/particles/src/ParticleCollisionSystem.cpp
2014-01-03 16:26:17 -08:00
Philip Rosedale
83101d3d11
reduce elasticity to be less than 1
2014-01-03 15:31:16 -08:00
Philip Rosedale
2cf5efc4a8
Merge pull request #1449 from PhilipRosedale/mirror
...
Mirror
2014-01-03 15:25:28 -08:00
Philip Rosedale
2286916fbb
Don’t render head if inside it!
2014-01-03 15:00:42 -08:00
Andrzej Kapolka
ed4ad1cea9
Removed some unused code.
2014-01-02 15:37:56 -08:00
Andrzej Kapolka
6c27569e9b
Fix arm bending, compile warning.
2014-01-02 13:23:15 -08:00
Philip Rosedale
e3a77ef139
tuning
2013-12-26 20:20:57 -08:00
Philip Rosedale
74380260b3
Grab includes rotation
2013-12-26 19:07:02 -08:00
Philip Rosedale
58a73dfede
yet again remove the test _balls now that we have a particle server
2013-12-21 18:06:04 -08:00
Philip Rosedale
bad47bd527
Fixed chat height
2013-12-20 15:33:56 -08:00
Philip Rosedale
d6efcce28e
Debugging render call for head/hand positions, debugging for ball injection
2013-12-17 11:08:38 -08:00
Philip Rosedale
21d7fe1277
Grab and move with button 4
2013-12-13 21:59:19 -08:00
Philip Rosedale
132b313c9c
remove voxel glow on local add
2013-12-10 17:00:53 -08:00
Philip Rosedale
c9f96d1adf
Basic joystick thrust/view drive behavior
2013-12-10 16:52:08 -08:00
Philip Rosedale
4edb7decdf
removed printf
2013-12-06 17:47:01 -08:00
Philip Rosedale
9195d60b71
Fix to jerky avatar movement, fix for rotation broken
2013-12-06 17:45:28 -08:00
Philip Rosedale
4707733563
Removed avatar balls
2013-12-06 16:26:02 -08:00
Philip Rosedale
0fcc2d8634
Removed _avatarTouch class
2013-12-06 15:11:01 -08:00
Philip Rosedale
3f957bbf5d
Rave out!
2013-12-05 16:46:11 -08:00
Philip Rosedale
a7dacec63d
Don’t render collision if not own avatar, don’t check for collisions with voxel tree if not me.
2013-12-05 13:36:00 -08:00
Philip Rosedale
7ab9cc9c14
Voxel editing with hands, flying and rotation with hands
2013-12-02 00:17:06 -08:00
Philip Rosedale
ea850368de
First working voxel insertion at fingertip
2013-12-01 20:16:14 -08:00
Philip Rosedale
a9139b05e8
Drive with trigger pointing
2013-11-29 20:46:16 -08:00
Philip Rosedale
65ec91ec13
Add hand thrusters
2013-11-29 17:49:35 -08:00
Andrzej Kapolka
b294b328dd
Only render ball avatars when "avatars as balls" is checked.
2013-11-27 12:56:31 -08:00
Andrzej Kapolka
cabd6ccbad
Advertise to others whether we have chat circling enabled, only include people
...
with it enabled when doing the computations.
2013-11-27 11:47:23 -08:00
Philip Rosedale
09ca2a45db
Add local audio monitor option, tweak turning with head
2013-11-26 11:25:06 -08:00
Philip Rosedale
d7b1eae446
Merge branch 'master' of https://github.com/worklist/hifi
2013-11-25 09:45:27 -08:00
Philip Rosedale
a1ba36d543
Lean drive works with keys and no up/down
2013-11-22 20:08:44 -08:00
ZappoMan
7151d1679f
Merge pull request #1288 from ey6es/master
...
Have avatars glow/shrink out of existence when they log off or move to another domain/location.
2013-11-22 16:48:12 -08:00
Andrzej Kapolka
083800dc59
Glow/shrink avatars when killed, send kill message when we move between
...
domains, locations, etc.
2013-11-22 16:23:40 -08:00
Philip Rosedale
582a71990e
Improved using faceshift to turn body
2013-11-22 15:08:16 -08:00
Andrzej Kapolka
91b38313be
Treat pitchFromTouch more like yawFromTouch, persist mouse pitch.
2013-11-22 11:28:33 -08:00
Andrzej Kapolka
3137e9a3e6
Don't leave out the head when we draw our shadow.
2013-11-21 13:57:55 -08:00
Andrzej Kapolka
f38e74c51c
Merge branch 'master' of https://github.com/worklist/hifi into shadowplay
2013-11-21 11:18:56 -08:00
Andrzej Kapolka
5cc5d9bba8
Progress towards shadow maps.
2013-11-20 16:23:54 -08:00
Andrzej Kapolka
69b5b81f34
Limit combined pitch.
2013-11-19 16:31:24 -08:00
Andrzej Kapolka
bc523092ba
Sniffing glue, wrong week, etc.
2013-11-19 11:59:25 -08:00
Andrzej Kapolka
ced1fca2e4
Missed another spot.
2013-11-19 11:57:01 -08:00
Andrzej Kapolka
3d82fe65b4
Forgot this part.
2013-11-19 11:53:57 -08:00
Andrzej Kapolka
1e7866ad02
Clamped values, adjusted them.
2013-11-19 11:51:32 -08:00
Andrzej Kapolka
df8fbf8f72
More general, angle-driven form of driving based on lean.
2013-11-19 11:09:02 -08:00
Andrzej Kapolka
f59b403103
Drive avatar with Sixense joysticks and triggers.
2013-11-18 16:20:00 -08:00
Andrzej Kapolka
52a3071cb3
Order of update fix.
2013-11-13 12:29:43 -08:00
Andrzej Kapolka
feb2a150b7
Don't decay head roll/pitch when moving if Faceshift is active.
2013-11-08 18:05:24 -08:00
Philip Rosedale
2991c8af61
screen does not flash when voxels are clicked
2013-11-08 14:34:22 -08:00
Andrzej Kapolka
55d31ee7f3
Render the body in first-person mode so that we can see our hands.
2013-11-07 16:37:51 -08:00
Andrzej Kapolka
2b4db0ea0e
Apply Leap data directly to skeleton.
2013-11-06 16:47:03 -08:00
Andrzej Kapolka
d0cd9e9790
Active the hand when we have leap hand data.
2013-11-06 16:24:25 -08:00
Andrzej Kapolka
9460fb87c2
Return arm to neutral position when mouse pointer is invisible.
2013-11-05 16:06:11 -08:00
Andrzej Kapolka
6633b6a633
For now, don't perform avatar collisions unless we have a skeleton model.
2013-11-05 13:56:14 -08:00
Andrzej Kapolka
359083ee9d
Sneak in a toggle for chat circling.
2013-11-05 12:30:38 -08:00
Andrzej Kapolka
fdc44f5ec4
Have the hand fall to the side when the mouse is hidden.
2013-10-31 16:06:42 -07:00
Andrzej Kapolka
4e6edfc2db
Fix for arm on old skeleton.
2013-10-28 17:28:10 -07:00
Andrzej Kapolka
e7b05f40ef
Remove unused variables.
2013-10-28 16:07:07 -07:00
Andrzej Kapolka
6e76179ca3
Place hand based on mouse position, but make sure we don't point above the
...
shoulders.
2013-10-28 15:59:04 -07:00
Andrzej Kapolka
cf78e21ea4
Merge branch 'master' of https://github.com/worklist/hifi into ossome
...
Conflicts:
interface/src/Application.cpp
2013-10-23 10:06:56 -07:00
Andrzej Kapolka
9dd41f4206
Render sticks, use avatar colors.
2013-10-22 16:52:44 -07:00
Andrzej Kapolka
a33c7ce20c
More work on extracting rotations.
2013-10-22 12:54:32 -07:00
Andrzej Kapolka
b5f2dcfa55
Use the head position from the loaded skeleton, if available.
2013-10-21 16:58:01 -07:00
stojce
b45525ae21
Mirror View initial setup
2013-10-21 08:28:38 +02:00
Andrzej Kapolka
7e174093e4
Factoring the FBX model code out to a shared base class.
2013-10-18 17:26:03 -07:00
Andrzej Kapolka
c8b2ed0213
More progress on reading skeletons.
2013-10-17 17:30:34 -07:00
Andrzej Kapolka
36d4be4e3b
These should actually start at two pi (that's the maximum distance).
2013-10-17 11:05:52 -07:00
Andrzej Kapolka
b25020b84a
Need to halve the target angle, because both participants will be moving.
...
Use randomness to resolve cases where two participants are on top of one
another.
2013-10-17 10:58:33 -07:00
Andrzej Kapolka
121a7f8270
Widen the circle influence, increase the approach rate.
2013-10-16 17:48:28 -07:00
Andrzej Kapolka
89d6c7905b
Decrease the distance between members, increase the influence of the circle,
...
don't rotate members.
2013-10-16 17:21:09 -07:00
Philip Rosedale
c324933b8a
Move to 'european' comfort distance for chat circle
2013-10-16 16:49:33 -07:00
Andrzej Kapolka
7a1f845189
Another rate adjustment.
2013-10-16 15:48:25 -07:00
Andrzej Kapolka
6df245908c
Reduce the approach rate.
2013-10-16 15:41:38 -07:00
Andrzej Kapolka
50216ca4ad
Base the number of people we include in the circle on whether we would
...
actually fall in its radius (plus an expansion factor).
2013-10-16 15:37:59 -07:00
Andrzej Kapolka
11fea386b6
First stab at chat circling mechanism.
2013-10-16 14:07:36 -07:00
Eric Johnston
36f06720d0
Add left-arm movement to remote avatars without changing network packet structure.
...
Move MyAvatar leap hand arm-movement into Avatar::updateLeapHandPositions(), to enable remote avatars to position fingertips and IK-arms based on Leap hand data.
2013-10-16 08:21:35 -07:00
Eric Johnston
7bc2cf6fa9
Leap interface and Avatar: left-hand IK works for Leap interface.
...
This is in and smooth, and there's a decision to be made:
In the case where only one hand is visible, we have to decide if it's the left or right hand. Currently it's simple, based on which side it's detected on.
So far this seems to work best, in the (very) common case where hands go in/out of the sensor's field frequently.
We could also use a history-based heuristic to hold one hand as left/right, but that means that when it guesses wrong the error lingers.
Detecting handedness based on where the thumbs are would be better, but is unreliable on the Leap.
I went for the simple/clear version, but we can do whatever we want.
2013-10-14 09:01:50 -07:00
Philip Rosedale
6281a28f69
better movement near others
2013-10-11 17:00:25 -07:00
Andrzej Kapolka
4c073426c8
Ball and cone color from average geometry colors.
2013-10-10 13:41:50 -07:00
Andrzej Kapolka
14dfa72284
Rotation fix.
2013-10-10 11:25:11 -07:00
Andrzej Kapolka
052c8246fa
Let's use the "eye level" position.
2013-10-10 10:49:19 -07:00
Philip Rosedale
27a892fa55
Removed old head rotation code, menu items, added ability to turn off faceshift head rotation
2013-10-09 22:46:34 -07:00
Andrzej Kapolka
5511c02449
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 11:53:08 -07:00
Andrzej Kapolka
1b4daa8eb9
No glow on own avatar, only on others when farther than five units away.
2013-10-09 10:17:41 -07:00
Stephen Birarda
b17e12460c
shift get/set of face model URL to Profile class
2013-10-08 13:52:04 -07:00
Stephen Birarda
85edb93710
add a Profile class to hold user data from data-server
2013-10-08 12:13:45 -07:00
Stephen Birarda
e9e77d8276
set username instead of UUID in Interface preferences
2013-10-07 13:35:16 -07:00
Stephen Birarda
f36fd47ef7
store username and not UUID for MyAvatar
2013-10-07 12:17:47 -07:00
Stephen Birarda
98f435ccc2
link mesh URL and UUID in prefs to data server client
2013-10-07 12:03:04 -07:00
Stephen Birarda
ca68846c1b
some deletions and cleanup based on Xcode analysis
2013-09-30 15:36:23 -07:00
Philip Rosedale
9645cd9831
Click on voxels as way of moving around
2013-09-28 15:18:59 -07:00
Freddy
c78aa591c5
Fix spinning while flying, top speed now about Mach 1
2013-09-27 15:08:10 -07:00
Freddy
f88a3633a5
Slow down when near other avatars for easier positioning
2013-09-27 00:40:41 -07:00
Freddy
6b0f9314ba
Faceshift drives body rotation, remove gyro-driven rotation
2013-09-26 23:52:44 -07:00
Freddy
6bbe34a8c4
missing space
2013-09-23 23:06:32 -07:00
Freddy
027811e37c
Increase thrust while holding keys down to allow very fast speeds
2013-09-23 22:53:35 -07:00
Andrzej Kapolka
0fa2eca02d
Remove option to use Faceshift rig (using the "macaw" model has much the same
...
result, and it lets other people see it).
2013-09-23 10:43:20 -07:00
Andrzej Kapolka
24bf1e2036
Don't render neck/neck base when blend face is active.
2013-09-20 17:55:31 -07:00
Stephen Birarda
f8f0e3db1b
remove the sphere from the ground plane
2013-09-20 14:04:18 -07:00
Andrzej Kapolka
b4ca66eb68
Merge branch 'master' of https://github.com/worklist/hifi into blendface
...
Conflicts:
interface/src/devices/Faceshift.cpp
2013-09-17 11:05:11 -07:00
Andrzej Kapolka
262365f15f
Only render the Perlin face for the local user.
2013-09-17 10:51:33 -07:00
Andrzej Kapolka
f9426cbecc
Working on reading and rendering the rig from Faceshift.
2013-09-16 15:49:40 -07:00
Andrzej Kapolka
db8575b59a
Reduced the restore rate.
2013-09-10 11:25:30 -07:00
Andrzej Kapolka
c56778c3bf
When devices become inactive (including when Faceshift reports loss of
...
tracking), smoothly restore neutral head rotation/lean.
2013-09-10 11:14:36 -07:00
Andrzej Kapolka
0a9db6a5ee
Moved device-related files to "devices" folder.
2013-09-04 12:15:36 -07:00
Andrzej Kapolka
734cb83e81
Read Faceshift head translation/rotation.
2013-09-03 13:56:04 -07:00
Stephen Birarda
b46bd1fd41
display the Avatar's hand in first person
2013-08-30 10:28:30 -07:00
Andrzej Kapolka
28ffd8eca7
Render the ball heads with the voxeltar bodies.
2013-08-23 14:22:00 -07:00
Andrzej Kapolka
7da9556815
Glow when moving.
2013-08-22 11:23:28 -07:00
Stephen Birarda
6206d9e8db
fix for collisions when wearing Oculus
2013-08-21 17:42:13 -07:00
LionTurtle
3eb0a1a190
Magic number removal...
2013-08-21 16:35:16 -07:00
LionTurtle
e252d3b2ac
Style and spacing changes in MyAvatar/Avatar classes.
2013-08-21 16:32:06 -07:00
LionTurtle
de9bd9e1b8
Add MyAvatar and resolve merge conflicts.
2013-08-21 13:38:23 -07:00
