Philip Rosedale
db95b0d726
Merge remote-tracking branch 'upstream/master'
2013-04-17 17:00:10 -07:00
birarda
8d4061dd72
Merge pull request #72 from birarda/master
...
a better interim solution for bytes per avatar
2013-04-17 16:58:49 -07:00
Stephen Birarda
e75add411c
use a constant number of BYTES_PER_AVATAR as an interim solution
2013-04-17 16:58:16 -07:00
Jeffrey Ventrella
ecb5047e7c
removed initializeAvatar() method in Head class (deprecated). and also un-negated the pos in the rendering of other avatars (same fix as Philip just made)
2013-04-17 16:58:04 -07:00
Philip Rosedale
6b03622e29
Fixed bug having other people showing up at negative of their transmitted position.
2013-04-17 16:49:39 -07:00
Jeffrey Ventrella
5aeb307be2
including Philips hand position transmission code
2013-04-17 15:36:40 -07:00
Jeffrey Ventrella
5595bb8cf6
Merge remote-tracking branch 'upstream/master'
2013-04-17 15:34:00 -07:00
Jeffrey Ventrella
0306b63af4
added more cleanup and preparation for switching over to quaternions
2013-04-17 15:32:16 -07:00
Jeffrey Ventrella
754856227d
Merge pull request #69 from PhilipRosedale/master
...
Added hand position to transmission
2013-04-17 15:29:18 -07:00
birarda
091875aedd
Merge pull request #70 from birarda/master
...
comment cleanup in AvatarData
2013-04-17 15:25:47 -07:00
Stephen Birarda
1a3df2be5f
comment cleanup in AvatarData
2013-04-17 15:25:05 -07:00
tosh
3175ba7d45
Merge branch 'master' of git://github.com/worklist/hifi into 19188
2013-04-18 00:18:38 +02:00
Philip Rosedale
952cb2f2ae
Added head _isMine variable, added hand position transmission!
2013-04-17 15:14:30 -07:00
tosh
38d229ab67
reiterates starfield:
...
o allows UrlReader to cache the downloaded content in a local (updating it
automatically when the server indicates a newer time stamp)
o retires the FieldOfView class
o makes the stars move again
o fixes bad deletion in UrlReader (delete instead of delete[])
o allows UrlReader to advertise supported compression algorithms to the server
2013-04-18 00:13:41 +02:00
Philip Rosedale
5729ecb3f4
Merge remote-tracking branch 'upstream/master'
2013-04-17 14:23:43 -07:00
birarda
49ac518690
Merge pull request #68 from birarda/master
...
fix number of bytes per agent from avatar mixer
2013-04-17 13:16:51 -07:00
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
tosh
ebc6a25574
Merge branch 'master' of git://github.com/worklist/hifi into 19188
2013-04-17 20:57:39 +02:00
Stephen Birarda
e9592c45c7
fix reference to resources directory on OS X
2013-04-17 11:56:32 -07:00
tosh
77832dbcb4
makes FieldOfView store the view matrix instead of its inverse
2013-04-17 20:53:24 +02: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
tosh
bf5f54c9d0
integrates logging for 'avatars' library, fixes missig return in Log.cpp, adds _lib suffix for log callback namespaces and reverts voxels -> voxLib rename in main
2013-04-17 20:14:29 +02:00
Jeffrey Ventrella
53796d067f
changed Ori constructor to include setIdentity
2013-04-17 11:11:05 -07:00
tosh
f899ff9378
adds logging support to voxels library
2013-04-17 20:01:58 +02:00
tosh
c261449937
Merge branch 'master' of git://github.com/worklist/hifi into 19262
2013-04-17 20:01:51 +02:00
tosh
4ddbbd6209
fixes misplaced include .h -> .cpp
2013-04-17 20:01:33 +02:00
Stephen Birarda
0768785cfd
fix mutex movement when resizing AgentList vector
2013-04-17 11:01:08 -07:00
tosh
493fafb213
adds optional LogStream for cpp iostream-style logging
2013-04-17 19:48:30 +02:00
tosh
e55863a662
integrates logging for 'shared' library
2013-04-17 19:46:00 +02:00
tosh
349e89aaa6
integrates logging for interface
2013-04-17 19:04:10 +02:00
tosh
e7810179de
reduces default character size
2013-04-17 19:03:39 +02:00
Philip Rosedale
2e928166ed
Merge remote-tracking branch 'upstream/master'
2013-04-17 10:00:17 -07:00
tosh
81cae86559
brings logging component to stable state
2013-04-17 18:35:10 +02:00
tosh
4fa5760162
Merge branch 'master' of git://github.com/worklist/hifi into 19262
...
Conflicts:
interface/src/Util.cpp
2013-04-17 18:34:43 +02: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
Philip Rosedale
d046162eaf
Merge remote-tracking branch 'upstream/master'
2013-04-16 20:32:32 -07:00
Philip Rosedale
39bb556cd3
Fix to add local variable underscores to head get/add body yaw functions.
2013-04-16 20:29:10 -07:00
