Stephen Birarda
|
3e65d5a548
|
inline getters and setters in Avatar
|
2013-05-17 12:25:00 -07:00 |
|
Stephen Birarda
|
1ba1b56b2c
|
disallow copying of Avatar objects
|
2013-05-17 12:15:19 -07:00 |
|
Stephen Birarda
|
c214e9b179
|
use the default Avatar destructor, comment out unused consts in Head
|
2013-05-17 10:46:59 -07:00 |
|
Stephen Birarda
|
a1ea7b58dd
|
remove unused GLUQuadric sphere from Avatar class
|
2013-05-17 10:45:26 -07:00 |
|
Jeffrey Ventrella
|
7e0877e753
|
cleanup
|
2013-05-17 08:48:54 -07:00 |
|
Jeffrey Ventrella
|
1c126e2525
|
resolved conflicts
|
2013-05-16 17:32:54 -07:00 |
|
Jeffrey Ventrella
|
750a48bb73
|
cleaned up head class - made most members private. Added copy constructor
|
2013-05-16 17:20:00 -07:00 |
|
Philip Rosedale
|
b2709652b4
|
Tweaks to improve mouse Yaw behavior.
|
2013-05-16 14:43:46 -06:00 |
|
Philip Rosedale
|
78bd5ab40f
|
Fixes per review
|
2013-05-16 13:34:48 -06:00 |
|
Philip Rosedale
|
1b039c3755
|
Transmitter V2 drives the hand, and rendering levels with 'l' shows the hand transmitter data. Physics will need to be tuned.
|
2013-05-16 00:10:10 -06:00 |
|
Philip Rosedale
|
124f04820e
|
Removed renderPitch(), and renderYaw() from code/classes - we will use bodyPitch(), headPitch() only.
|
2013-05-15 09:52:12 -07:00 |
|
Jeffrey Ventrella
|
a0e8c0da74
|
more work on avatar lookat
|
2013-05-14 18:15:54 -07:00 |
|
Jeffrey Ventrella
|
f53b49c496
|
working on lookat (eye contact)
|
2013-05-14 17:30:41 -07:00 |
|
Philip Rosedale
|
6cfdf96dea
|
Added mouse panning in the Yaw direction - at edges of screen.
|
2013-05-14 17:11:16 -07:00 |
|
Jeffrey Ventrella
|
3ab0fa4e8c
|
added code to detect mouse hovering over avatar joints for various touch effects
|
2013-05-13 14:00:25 -07:00 |
|
Jeffrey Ventrella
|
847bfbdadd
|
mode cleanup after head operation
|
2013-05-10 17:29:04 -07:00 |
|
Jeffrey Ventrella
|
7fc2756257
|
I just did a headotomy (removed all head-related stuff from Avatar and made it its own class)
|
2013-05-10 17:05:52 -07:00 |
|
Jeffrey Ventrella
|
6254a6886f
|
cleaned up camera code and improved first person mode
|
2013-05-09 22:11:33 -07:00 |
|
Philip Rosedale
|
ddc97a6ac9
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-08 19:36:45 -07:00 |
|
Philip Rosedale
|
76c5a74876
|
Added gyro pitch to view, moved onscreen displays around to look nicer.
|
2013-05-08 19:35:48 -07:00 |
|
Jeffrey Ventrella
|
bbd85664d6
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-08 19:24:07 -07:00 |
|
Jeffrey Ventrella
|
7a24c50063
|
put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer
|
2013-05-08 19:22:21 -07:00 |
|
Philip Rosedale
|
ad25150d62
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-08 14:51:52 -07:00 |
|
Philip Rosedale
|
baf64c07dc
|
Added Procedural audio noise when moving, scaled to velocity
|
2013-05-08 09:04:38 -07:00 |
|
Jeffrey Ventrella
|
9e60c8a36e
|
increased GRAVITY_SCALE to 10.0; tidied-up avatar code; moved Orientation class to shared folder
|
2013-05-08 08:59:29 -07:00 |
|
Jeffrey Ventrella
|
22a0e39d6c
|
more work on avatar touch, reachable radius, and hand states
|
2013-05-06 18:29:20 -07:00 |
|
Jeffrey Ventrella
|
c1ac3eb320
|
improving the code for detecting collisions, hand movement and handholding
|
2013-05-06 15:14:13 -07:00 |
|
Jeffrey Ventrella
|
2a1bbcc168
|
improved avatar gravity code and moved source of gravity vector to main.cpp
|
2013-05-06 12:35:52 -07:00 |
|
Stephen Birarda
|
1a8564f9d9
|
store avatar position and yaw in file to restore on relaunch
|
2013-05-03 15:05:28 -07:00 |
|
Jeffrey Ventrella
|
026ee4345c
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-03 10:54:07 -07:00 |
|
Jeffrey Ventrella
|
e0b33e56da
|
couple of small code cleanups
|
2013-05-03 10:52:44 -07:00 |
|
Andrzej Kapolka
|
346f213e3b
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
interface/src/Avatar.cpp
interface/src/Avatar.h
interface/src/main.cpp
|
2013-05-03 10:31:40 -07:00 |
|
Philip Rosedale
|
1fbc13941d
|
Fixes per merge (Ventrella)
|
2013-05-03 10:16:58 -07:00 |
|
Andrzej Kapolka
|
43b5e9430f
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
interface/src/main.cpp
|
2013-05-03 10:04:50 -07:00 |
|
Philip Rosedale
|
b703d0982e
|
Changed avatar.h to store _distanceToNearestAvatar
|
2013-05-03 09:55:25 -07:00 |
|
Jeffrey Ventrella
|
c46fc5a861
|
(1) added avatar tilting while walking; (2) added avatar renderer; (3) tweaked body proportions; (4)
|
2013-05-02 17:46:10 -07:00 |
|
Jeffrey Ventrella
|
cd334c2ade
|
renamed avatar skeleton from "bones" to "joints" to be more consistent with standard language. Also improved skeleton some
|
2013-05-02 13:13:56 -07:00 |
|
Andrzej Kapolka
|
b0bbca281d
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
interface/src/main.cpp
|
2013-05-02 13:10:39 -07:00 |
|
Jeffrey Ventrella
|
35a8066bd6
|
fixed merge problem
|
2013-05-02 11:05:51 -07:00 |
|
Jeffrey Ventrella
|
1e6ba9cc34
|
(1) raised Eve's hand; (2) renamed some member variables; (3) added more functionality to hand-holding
|
2013-05-01 20:35:21 -07:00 |
|
Jeffrey Ventrella
|
f86a92fef0
|
fixed some small formatting glitches in code and added a way to make head lean affect the position of the head
|
2013-05-01 16:51:15 -07:00 |
|
Jeffrey Ventrella
|
aeb545656e
|
(1) added a few methods to orientation; (2) fixed Eve's height; (3) added pitch and roll members to Avatar (not used yet); added avatar pull from handshake;
|
2013-05-01 15:38:55 -07:00 |
|
Jeffrey Ventrella
|
c88a7f8f55
|
fixed merge
|
2013-05-01 13:51:59 -07:00 |
|
Jeffrey Ventrella
|
b388e9a760
|
(1) re-designed and debugged the orientation class and cleaned up quaternion code, and fixed issues in camera and main related to yaw and camera transforms (2) improved hand-holding algorithm
|
2013-05-01 13:00:08 -07:00 |
|
Andrzej Kapolka
|
13a4058068
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-30 16:06:44 -07:00 |
|
Philip Rosedale
|
24a636486e
|
Added Google glass support, cleaned up gyro code, ready for Oculus!
|
2013-04-30 16:04:55 -07:00 |
|
Philip Rosedale
|
6142372219
|
Merge remote-tracking branch 'origin/master'
|
2013-04-30 13:44:49 -07:00 |
|
Philip Rosedale
|
8e06602e9a
|
Added Avatar method to allow received UDP transmitter data to drive the avatar head rotation, cleaned up gyro code.
|
2013-04-30 13:40:16 -07:00 |
|
Andrzej Kapolka
|
8b742e43e6
|
GCC fails on these constants (ISO C++ forbids initialization of member
‘COLLISION_BALL_FORCE’), so I moved them into the CPP (they don't seem to
require external visibility anyway).
|
2013-04-30 10:15:48 -07:00 |
|
Jeffrey Ventrella
|
fe9ab0a213
|
improved collisions
|
2013-04-29 14:11:33 -07:00 |
|