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 |
|
Andrzej Kapolka
|
46041b2ed9
|
Style tweaks: preface privates with underscore, capitalize enum members.
|
2013-04-26 10:21:14 -07:00 |
|
Philip Rosedale
|
e4c2004a69
|
Added constant to turn OFF avatar BALLS testing
|
2013-04-26 09:34:10 -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 |
|
Andrzej Kapolka
|
c6661e8b8e
|
Lowered the chat message height and put it in a variable.
|
2013-04-25 17:48:47 -07:00 |
|
Andrzej Kapolka
|
c6af08d883
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
avatar-mixer/src/main.cpp
|
2013-04-25 17:40:55 -07:00 |
|
Andrzej Kapolka
|
1713bebb64
|
Added the basic key press/message composition display.
|
2013-04-25 17:36:47 -07:00 |
|
Stephen Birarda
|
09256d8c4e
|
put back default for AVATAR_BONE_RIGHT_FOREARM
|
2013-04-25 17:15:48 -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 |
|
Stephen Birarda
|
cdb8b1b144
|
Merge remote-tracking branch 'upstream/master' into agentlist-array
|
2013-04-25 16:40:20 -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 |
|
Stephen Birarda
|
8370fd2d19
|
spacing fixes in Avatar class
|
2013-04-25 16:04:08 -07:00 |
|
Stephen Birarda
|
be37237b84
|
fix indent in Avatar class
|
2013-04-25 15:58:42 -07:00 |
|
Stephen Birarda
|
114f949a6e
|
spacing cleanup in Avatar class
|
2013-04-25 15:58:03 -07:00 |
|
Stephen Birarda
|
625a963918
|
prefer -> notation to (*TYPE) for AgentList iterator
|
2013-04-25 15:49:25 -07:00 |
|
Andrzej Kapolka
|
d5da35e91a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-25 15:41:57 -07:00 |
|
Andrzej Kapolka
|
620e1c728c
|
Removed kludge; it turned out lighting was enabled.
|
2013-04-25 15:41:09 -07:00 |
|
Stephen Birarda
|
dac660efda
|
resolve conflicts after merge with upstream master
|
2013-04-25 15:30:57 -07:00 |
|
Stephen Birarda
|
5ddd9a9f4f
|
Merge remote-tracking branch 'upstream/master' into agentlist-array
|
2013-04-25 15:27:40 -07:00 |
|
Andrzej Kapolka
|
d041072d40
|
Delete support (though the one on my numeric keypad doesn't work?),
sending key states.
|
2013-04-25 15:26:05 -07:00 |
|
Andrzej Kapolka
|
675d06e4b9
|
More chat bits; basic functionality now working.
|
2013-04-25 14:03:31 -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 |
|
Jeffrey Ventrella
|
9a4d27c0b5
|
cleaned up some camera code and added some functionality for first-person view
|
2013-04-25 12:19:23 -07:00 |
|
Jeffrey Ventrella
|
68b3f54f5c
|
tiny change
|
2013-04-25 10:44:01 -07:00 |
|
Philip Rosedale
|
9e62728c33
|
Changed velocity to be dvec3
|
2013-04-25 10:18:30 -07:00 |
|
Philip Rosedale
|
b9fb888073
|
Small speed/cleanup to thrust setting
|
2013-04-25 10:02:14 -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
|
72e6e18992
|
fixed avatar collisions
|
2013-04-24 17:54:09 -07:00 |
|
Jeffrey Ventrella
|
2163976f06
|
adding the files
|
2013-04-24 17:01:59 -07:00 |
|