Jeffrey Ventrella
|
dcd6aafb77
|
trying to get around git confusion
|
2013-04-16 15:54:20 -07:00 |
|
Jeffrey Ventrella
|
fc5d412e53
|
fixed idealYaw issue
|
2013-04-16 15:51:22 -07:00 |
|
ZappoMan
|
4f5ddb3700
|
fixed yaw/ideal yaw problem correctly
|
2013-04-16 15:46:20 -07:00 |
|
ZappoMan
|
edfb1501f1
|
fixed merge problem with shifted avatar
|
2013-04-16 15:41:38 -07:00 |
|
Jeffrey Ventrella
|
fcbf44cad9
|
trying to get around git confusion
|
2013-04-16 15:11:23 -07:00 |
|
Jeffrey Ventrella
|
0c85f832e6
|
trying to get around git confusion
|
2013-04-16 14:56:49 -07:00 |
|
birarda
|
7ef80b37be
|
Merge pull request #55 from ZappoMan/view_frustum_work
Latest view frustum work
|
2013-04-16 14:53:48 -07:00 |
|
Stephen Birarda
|
2f5d5398b2
|
comment cleanup in Camera.cpp
|
2013-04-16 14:39:23 -07:00 |
|
ZappoMan
|
0ff88b882b
|
tweaks to default Camera near clip, and camera positions in interface
|
2013-04-16 14:06:48 -07:00 |
|
Jeffrey Ventrella
|
1bef9544d9
|
Merge remote-tracking branch 'origin/master'
|
2013-04-16 13:56:45 -07:00 |
|
Jeffrey Ventrella
|
216cc465e7
|
Added idealYaw to camera and also switched ordering of gl camera rotation commands
|
2013-04-16 13:51:14 -07:00 |
|
Stephen Birarda
|
1dd21a450e
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-16 12:00:55 -07:00 |
|
Stephen Birarda
|
2b49442039
|
resolve conflicts on merge with upstream master
|
2013-04-15 18:34:40 -07:00 |
|
Stephen Birarda
|
c6f8cc50a9
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-15 18:34:18 -07:00 |
|
ZappoMan
|
47a4211257
|
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
Conflicts:
interface/src/Camera.cpp
interface/src/Camera.h
interface/src/main.cpp
|
2013-04-15 18:05:35 -07:00 |
|
ZappoMan
|
c2c36e6cea
|
Tweaks to Camera class
- added lens attributes
- coding standard cleanup
|
2013-04-15 17:56:52 -07:00 |
|
Stephen Birarda
|
a4011934c6
|
move Orientation class to avatars library, constants to SharedUtil
|
2013-04-15 15:39:23 -07:00 |
|
Jeffrey Ventrella
|
ca05823010
|
added some smoothness to the camera
|
2013-04-12 18:06:11 -07:00 |
|
Jeffrey Ventrella
|
265fcc6095
|
a few small fixes on the avatar springs
|
2013-04-12 15:00:48 -07:00 |
|
Jeffrey Ventrella
|
f294cc8782
|
working on avatar orientation issues
|
2013-04-10 21:12:15 -07:00 |
|
Jeffrey Ventrella
|
09af8d153f
|
added camera modes and also set initial avatar yaw to 90
|
2013-04-09 15:05:37 -07:00 |
|
Jeffrey Ventrella
|
87c26a39fb
|
adding more changes and small improvements to camera, and head...
|
2013-04-09 12:54:59 -07:00 |
|
Jeffrey Ventrella
|
a0f09b597a
|
got a basic avatar skeleton with a simpler starter user interaction for moving the right hand
|
2013-04-05 16:19:23 -07:00 |
|
Jeffrey Ventrella
|
d3f6c19e83
|
adding Camera and some utility classes and start of prototype avatar
|
2013-04-04 18:04:32 -07:00 |
|