ZappoMan
026fb5b344
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-04 09:34:37 -07:00
ZappoMan
ceb15d407d
removed assert
2013-06-03 22:08:19 -07:00
ZappoMan
510dfc7353
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
2013-06-03 21:43:38 -07:00
ZappoMan
cf3ff53e2c
copy and paste working
2013-06-03 18:08:11 -07:00
ZappoMan
0b7f4b21f4
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-06-03 16:42:27 -07:00
ZappoMan
7dd217b318
more work on copy and paste
2013-06-03 10:57:18 -07:00
ZappoMan
e5e200345b
more work on copy and paste
2013-05-31 11:52:18 -07:00
Andrzej Kapolka
98759c3ba1
Include <unistd.h> to address a build error experienced by Clement.
2013-05-31 10:27:25 -07:00
ZappoMan
b0397e8eb9
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
2013-05-30 21:41:55 -07:00
Stephen Birarda
1f4e9f3051
update last heard from time for audio injectors
2013-05-29 18:37:03 -07:00
ZappoMan
46c6f2f9b5
latest copy paste
2013-05-29 15:02:28 -07:00
ZappoMan
377fb1e936
latest copy and paste
2013-05-29 12:06:58 -07:00
ZappoMan
04f4e499e1
Optimize wire-format for AvatarData
...
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
2013-05-27 14:18:10 -07:00
ZappoMan
5d1ba857c5
Optimize View Frustum wire format.
...
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
2013-05-27 14:17:34 -07:00
Stephen Birarda
6158410658
provide a getter for the owning agent in AgentData
2013-05-24 12:32:00 -07:00
Stephen Birarda
59a6016f4b
use a NULL default for owningAvatar to simplify constructors
2013-05-24 12:18:38 -07:00
Stephen Birarda
36892da488
keep a pointer to owning agent in AgentData
2013-05-24 12:17:34 -07:00
Andrzej Kapolka
629c7b0146
Send all environment data in the same packet and only send it about once a
...
second.
2013-05-22 17:09:35 -07:00
birarda
9ec04855f8
Merge pull request #386 from ZappoMan/voxel_animation
...
Fix some crashing issues on delete
2013-05-22 14:27:29 -07:00
ZappoMan
c2ebd6fc95
CR feedback
2013-05-22 14:23:27 -07:00
Andrzej Kapolka
f70b2ceb76
Reverted change that would have added glm to shared library.
2013-05-22 11:23:55 -07:00
Andrzej Kapolka
8b1362636e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-21 22:29:46 -07:00
Philip Rosedale
8b65fcae75
Merge pull request #352 from tschw/master
...
refactors logging, adds comments, and revises names & formatting in all submitted code
2013-05-21 22:10:10 -07:00
Andrzej Kapolka
a864a6f8c6
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-21 21:34:09 -07:00
Andrzej Kapolka
fd98982fa6
Support for multiple environments, collisions with notional planet surfaces.
2013-05-21 21:33:08 -07:00
birarda
63fcb2eeef
Merge pull request #367 from ZappoMan/voxel_animation
...
Fixes "Delete" voxel behavior
2013-05-21 17:43:36 -07:00
Stephen Birarda
944e7a32e9
trivial fix for the continously dying animation server
2013-05-21 15:53:58 -07:00
tosh
ba4f4b9809
Merge branch 'master' of git://github.com/worklist/hifi
2013-05-21 22:49:39 +02:00
ZappoMan
0bcd629c8a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-05-21 13:46:04 -07:00
ZappoMan
7c9be4b9f5
cleanup code
2013-05-21 11:42:13 -07:00
Philip Rosedale
7728a54d26
Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter
2013-05-20 19:00:49 -07:00
tosh
a86b8a1d93
refactors logging
2013-05-21 01:00:10 +02:00
tosh
06288e8366
Merge branch 'master' of git://github.com/worklist/hifi
...
Conflicts:
interface/src/Oscilloscope.cpp
2013-05-20 23:15:06 +02:00
ZappoMan
4298b922a2
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
...
Conflicts:
libraries/avatars/src/AvatarData.cpp
2013-05-20 13:55:01 -07:00
ZappoMan
321d1952d6
first cut at exists bits
2013-05-20 12:56:59 -07:00
Stephen Birarda
dae7bf8674
use AgentList defaults when AIM has no socket or address set
2013-05-20 11:48:50 -07:00
tosh
b3085debb8
further adjusts naming
2013-05-19 13:22:37 +02:00
tosh
fc2de0685b
adjusts naming and formatting of class definition
2013-05-19 12:48:17 +02:00
tosh
864d4e6734
Merge branch '19188' of git://github.com/tschw/hifi
2013-05-18 11:02:52 +02:00
birarda
efec33c6a2
Merge pull request #344 from birarda/voxel-noise
...
include time for srand on UNIX
2013-05-17 15:09:30 -07:00
Stephen Birarda
82c373242f
include time for srand on UNIX
2013-05-17 15:09:11 -07:00
birarda
67bab7e73d
Merge pull request #342 from birarda/voxel-noise
...
use stream identifier to match injected audio across packets
2013-05-17 15:07:29 -07:00
Stephen Birarda
85c0c1fa98
fix the mod so we get values up to 255
2013-05-17 15:07:12 -07:00
Philip Rosedale
bb86d7a141
Merge pull request #341 from ZappoMan/voxel_animation
...
fixed memory leak
2013-05-17 14:40:09 -07:00
ZappoMan
0db62b58f5
fixed memory leak
2013-05-17 14:35:50 -07:00
Stephen Birarda
b7b39c2a6e
have addOrUpdateAgent return a pointer to the agent instead of a bool
2013-05-17 14:03:15 -07:00
Philip Rosedale
a08745a9e8
Merge pull request #340 from ZappoMan/voxel_animation
...
New Animation Server
2013-05-17 13:57:11 -07:00
ZappoMan
316da59da3
first cut at animation server
2013-05-17 12:44:39 -07:00
Stephen Birarda
12bf23e4c8
disallow Agent copying
2013-05-17 12:14:44 -07:00
Stephen Birarda
a2f8d8ae25
break audio out of shared into its own library
2013-05-16 13:00:40 -07:00