Jeffrey Ventrella
bca2460395
Merge remote-tracking branch 'upstream/master'
2013-04-17 23:20:08 -07:00
Philip Rosedale
b7346474d0
Merge pull request #71 from tschw/19188
...
19188
2013-04-17 22:15:39 -07:00
Jeffrey Ventrella
4e12f26467
added _isMine check for my _bodyYaw update
2013-04-17 18:10:32 -07:00
Philip Rosedale
6ad12e15ed
Merge remote-tracking branch 'upstream/master'
2013-04-17 17:51:32 -07:00
Jeffrey Ventrella
de3de7b878
Merge remote-tracking branch 'upstream/master'
2013-04-17 17:50:08 -07:00
Philip Rosedale
557bf79e0a
body yaw debugging (commented out)
2013-04-17 17:49:26 -07:00
Jeffrey Ventrella
aba20c6afd
a few debugging changes
2013-04-17 17:48:08 -07:00
birarda
27adc1f84b
Merge pull request #76 from birarda/master
...
remove a debug line
2013-04-17 17:43:55 -07:00
Stephen Birarda
24994f3561
remove extra debug line left over from mutex fixes
2013-04-17 17:43:30 -07:00
birarda
3819185bc2
Merge pull request #75 from birarda/master
...
fix unpack of angle in AvatarData
2013-04-17 17:42:11 -07:00
Stephen Birarda
4340f127e1
cast max uint16_t to float for angle unpack
2013-04-17 17:41:37 -07:00
Jeffrey Ventrella
d7f37e5972
Merge remote-tracking branch 'upstream/master'
2013-04-17 17:04:24 -07:00
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
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
Jeffrey Ventrella
a44ff94f85
Merge remote-tracking branch 'upstream/master'
2013-04-17 12:50:41 -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
Philip Rosedale
e558f45426
Merge pull request #63 from Ventrella/master
...
fixed orientation contrstuctor
2013-04-17 11:21:50 -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
Jeffrey Ventrella
1fb8d0b268
consolidated some code in Head.cpp
2013-04-16 20:35:50 -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
ZappoMan
4422ade9ff
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-16 12:50:04 -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
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
0182c29e7b
switch Util for SharedUtil in ViewFrustum
2013-04-16 12:25:23 -07:00
Stephen Birarda
598bed3b55
include cstring and stdint in AvatarData UNIX build
2013-04-16 12:22:09 -07:00
Stephen Birarda
e7e7bd290a
remove debugging on voxel deletion
2013-04-16 12:04:56 -07:00
Stephen Birarda
1dd21a450e
Merge remote-tracking branch 'upstream/master'
2013-04-16 12:00:55 -07:00
Stephen Birarda
e71f21b7bf
fix broken builds from last commit, pull new avatar data in VoxelAgentData
2013-04-16 11:59:03 -07:00
Stephen Birarda
5c091a51a6
change signature of parseData to use unsigned char*, include packet header always
2013-04-16 11:51:36 -07:00
ZappoMan
dcca1699d3
Adding first cut at ViewFrustum pointIn,SphereIn,BoxIn code.
...
- Added Plane class
- Added AABox class
- Removed some experimental "slightly inside" code from view frustum
2013-04-16 11:29:31 -07:00
ZappoMan
a3fabaf300
Merge pull request #50 from tschw/19188
...
19188
2013-04-16 08:25:07 -07:00
tosh
7c2cff824f
renames AngleUtils -> AngleUtil for consistency with the rest of the files
2013-04-16 14:07:19 +02:00
tosh
ac55c610be
tidies changeset
2013-04-16 14:06:03 +02:00
Stephen Birarda
861c8e76ee
grab jeffrey's changes to Util consts
2013-04-15 18:35:46 -07:00
