Jeffrey Ventrella
|
59ef9e5d7e
|
removed incomplete code snippet in Avatar.h
|
2013-04-26 13:21:49 -07:00 |
|
Jeffrey Ventrella
|
10b6c7759d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-26 12:16:22 -07:00 |
|
Jeffrey Ventrella
|
dc11055f8e
|
merge with upstream master and resolve conflicts
|
2013-04-26 12:15:48 -07:00 |
|
Philip Rosedale
|
824abca443
|
Removed field and Cloud classes
|
2013-04-26 11:57:04 -07:00 |
|
Stephen Birarda
|
7c855464e1
|
make the absolute head yaw getter const
|
2013-04-26 11:22:42 -07:00 |
|
Stephen Birarda
|
fbdcd57529
|
correct yaw sent to audio-mixer in Audio
|
2013-04-26 11:21:34 -07:00 |
|
Jeffrey Ventrella
|
fe2e180f16
|
merge with upstream master
|
2013-04-26 10:56:48 -07:00 |
|
Jeffrey Ventrella
|
ce1ceb849f
|
Added HandControl class and also Avatar Touch class
|
2013-04-25 23:32:04 -07:00 |
|
Philip Rosedale
|
cac9e33f8c
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
interface/src/Avatar.cpp
interface/src/Avatar.h
|
2013-04-25 20:47:01 -07:00 |
|
Philip Rosedale
|
1a5f499b45
|
First commit with initial Balls class for avatar sphere cloud
|
2013-04-25 19:56:47 -07:00 |
|
Stephen Birarda
|
d2714e9321
|
resolve conflicts on merge with upstream master
|
2013-04-25 17:04:18 -07:00 |
|
Stephen Birarda
|
e6d278ea12
|
Merge remote-tracking branch 'upstream/master' into agentlist-array
|
2013-04-25 17:01:17 -07:00 |
|
Stephen Birarda
|
3df81cc92a
|
resolve conflicts on merge with upstream master
|
2013-04-25 16:41:35 -07:00 |
|
Jeffrey Ventrella
|
7a94310d4e
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-25 16:32:27 -07:00 |
|
Jeffrey Ventrella
|
86e72a90d4
|
working on camera view shifting from first person to third person
|
2013-04-25 16:31:42 -07:00 |
|
Stephen Birarda
|
7e0dab6224
|
spacing fixes in Avatar class
|
2013-04-25 16:18:17 -07:00 |
|
Stephen Birarda
|
215efe3b78
|
bunch of const changes for glm::vec3 in Avatar and Orientation
|
2013-04-25 16:10:55 -07:00 |
|
Jeffrey Ventrella
|
5a0a1c1cec
|
increased YAW_MAG (faster turning), redesigned the concept of avatar position, and reset Eve's position accordingly. Also added _frustumNeedsReshape in camera in anticipation of fixing problem where setting fov doesn't reshape the frustum.
|
2013-04-25 13:51:20 -07:00 |
|
Philip Rosedale
|
9e62728c33
|
Changed velocity to be dvec3
|
2013-04-25 10:18:30 -07:00 |
|
Philip Rosedale
|
ba55175870
|
Gravity is ON near origin, off in space, and a gravity field can be created with getGravity()
|
2013-04-25 09:50:35 -07:00 |
|
Jeffrey Ventrella
|
2163976f06
|
adding the files
|
2013-04-24 17:01:59 -07:00 |
|