Stephen Birarda
|
4b1ce1158f
|
fix number of bytes for avatar processBulkAgentData
|
2013-04-17 13:15:44 -07:00 |
|
birarda
|
0b6be57b6d
|
Merge pull request #67 from Ventrella/master
preparations and housecleaning
|
2013-04-17 13:09:54 -07:00 |
|
Jeffrey Ventrella
|
a44ff94f85
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-17 12:50:41 -07:00 |
|
Jeffrey Ventrella
|
3856a70b7e
|
added "_" to several members in Head class, and cleaned up some code formatting (housecleaning :)
|
2013-04-17 12:48:47 -07:00 |
|
Jeffrey Ventrella
|
4f0ca2f33e
|
added quaternions to avatar body and bone structure (but not using them yet)
|
2013-04-17 12:31:03 -07:00 |
|
ZappoMan
|
eca7863cd9
|
Merge pull request #64 from birarda/master
fix reference to resources directory via switchToResourcesParentIfRequired
|
2013-04-17 12:04:25 -07:00 |
|
Stephen Birarda
|
e9592c45c7
|
fix reference to resources directory on OS X
|
2013-04-17 11:56:32 -07:00 |
|
Jeffrey Ventrella
|
851b833d35
|
Merge remote-tracking branch 'upstream/master'
|
2013-04-17 11:25:35 -07:00 |
|
Jeffrey Ventrella
|
3cee28f0ef
|
added back the av position
|
2013-04-17 11:23:47 -07:00 |
|
Philip Rosedale
|
e558f45426
|
Merge pull request #63 from Ventrella/master
fixed orientation contrstuctor
|
2013-04-17 11:21:50 -07:00 |
|
ZappoMan
|
62d787c434
|
Merge pull request #62 from birarda/master
fixing mutex movement when re-sizing AgentList vector
|
2013-04-17 11:18:45 -07:00 |
|
Jeffrey Ventrella
|
53796d067f
|
changed Ori constructor to include setIdentity
|
2013-04-17 11:11:05 -07:00 |
|
Stephen Birarda
|
0768785cfd
|
fix mutex movement when resizing AgentList vector
|
2013-04-17 11:01:08 -07:00 |
|
Philip Rosedale
|
a6f8d5dc62
|
Merge pull request #61 from ZappoMan/view_frustum_work
Adding testOrientationClass() to run unit tests on the orientation class
|
2013-04-17 08:17:03 -07:00 |
|
ZappoMan
|
184d28e905
|
Adding testOrientationClass() to run unit tests on the orientation class.
|
2013-04-17 00:42:49 -07:00 |
|
Jeffrey Ventrella
|
a6f82e1236
|
moved renderOrientstionDiretions to Utils
|
2013-04-16 23:39:43 -07:00 |
|
Jeffrey Ventrella
|
bd7c4273c3
|
tested camera orthonormals
|
2013-04-16 22:47:04 -07:00 |
|
Jeffrey Ventrella
|
f8d7b84a67
|
Merge remote-tracking branch 'origin'
|
2013-04-16 20:36:03 -07:00 |
|
Jeffrey Ventrella
|
1fb8d0b268
|
consolidated some code in Head.cpp
|
2013-04-16 20:35:50 -07:00 |
|
birarda
|
36559becb2
|
Merge pull request #60 from ZappoMan/view_frustum_work
Small tweaks to initial values for offset camera, so people can make sen...
|
2013-04-16 20:28:46 -07:00 |
|
ZappoMan
|
7a239fc7f0
|
Small tweaks to initial values for offset camera, so people can make sense of it
|
2013-04-16 20:25:08 -07:00 |
|
Jeffrey Ventrella
|
e825764304
|
added instrumentation to Orientation class to test for normalized and orthogonal vectors
|
2013-04-16 19:53:48 -07:00 |
|
Jeffrey Ventrella
|
1db06a8399
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-04-16 18:27:26 -07:00 |
|
Jeffrey Ventrella
|
f766843b7a
|
adjusted the ordering of porcessed in camera update method
|
2013-04-16 18:27:19 -07:00 |
|
birarda
|
c4eb46819b
|
Merge pull request #59 from birarda/master
fix number of bytes per agent from avatar mixer
|
2013-04-16 18:11:35 -07:00 |
|
Stephen Birarda
|
d0a83f3c0e
|
correct the number of bytes per agent from avatar mixer
|
2013-04-16 18:09:27 -07:00 |
|
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
|
7475887939
|
Merge pull request #58 from ZappoMan/view_frustum_work
fixed yaw/ideal yaw problem correctly
|
2013-04-16 15:50:52 -07:00 |
|
ZappoMan
|
4f5ddb3700
|
fixed yaw/ideal yaw problem correctly
|
2013-04-16 15:46:20 -07:00 |
|
birarda
|
dd992c1dec
|
Merge pull request #57 from ZappoMan/view_frustum_work
fixed merge problem with shifted avatar
|
2013-04-16 15:45:55 -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 |
|
birarda
|
ab73b67541
|
Merge pull request #56 from birarda/master
comment fixes in Camera.cpp
|
2013-04-16 14:40:09 -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 |
|
ZappoMan
|
4422ade9ff
|
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
|
2013-04-16 12:50:04 -07:00 |
|
birarda
|
60c37f053c
|
Merge pull request #54 from birarda/master
add missing packet header for broadcast head data
|
2013-04-16 12:49:28 -07:00 |
|
Stephen Birarda
|
f8ab33ccc7
|
add missing packet header for broadcast head data
|
2013-04-16 12:48:47 -07:00 |
|
ZappoMan
|
4a28e5889b
|
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
|
2013-04-16 12:39:58 -07:00 |
|
ZappoMan
|
ba016ca6f0
|
Merge pull request #53 from birarda/master
fix broken VS build, change some char* to unsigned char*
|
2013-04-16 12:38:16 -07:00 |
|
Stephen Birarda
|
8129c2477a
|
fix broken voxel server build, change some char* to unsigned char*
|
2013-04-16 12:35:49 -07:00 |
|
Stephen Birarda
|
c921fd9b87
|
remove unnecessary SharedUtil include
|
2013-04-16 12:26:44 -07:00 |
|
Stephen Birarda
|
8b165f546d
|
Merge branch 'master' of github.com:worklist/hifi
|
2013-04-16 12:25:35 -07:00 |
|
Stephen Birarda
|
0182c29e7b
|
switch Util for SharedUtil in ViewFrustum
|
2013-04-16 12:25:23 -07:00 |
|
birarda
|
f66961d337
|
Merge pull request #52 from birarda/master
missing includes for previous pull request
|
2013-04-16 12:23:03 -07:00 |
|