Jeffrey Ventrella
|
7f0d2e572e
|
some preliminary work on avatarRenderer
|
2013-05-20 07:38:00 -07:00 |
|
Jeffrey Ventrella
|
bbeac7701a
|
small fix
|
2013-05-18 14:43:23 -07:00 |
|
Jeffrey Ventrella
|
64392d0a78
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-18 14:32:28 -07:00 |
|
Jeffrey Ventrella
|
5a4813d5c9
|
improved algorithm for rotating eyes to look at target
|
2013-05-18 14:31:27 -07:00 |
|
ZappoMan
|
0ff65b44b5
|
Merge pull request #337 from tschw/19165
19165
|
2013-05-18 10:45:15 -07:00 |
|
birarda
|
6ec9a3c778
|
Merge pull request #350 from birarda/master
fix ordering of member variables in Head
|
2013-05-17 18:31:41 -07:00 |
|
Stephen Birarda
|
c504e8aa1a
|
fix incorrect ordering of member variables in Head
|
2013-05-17 18:30:41 -07:00 |
|
birarda
|
fc81e394cb
|
Merge pull request #349 from birarda/master
alphabetical ordering in CMakeLists
|
2013-05-17 17:55:06 -07:00 |
|
Stephen Birarda
|
391d6dca8e
|
remove the voxel server erase all that's unused
|
2013-05-17 17:54:04 -07:00 |
|
Stephen Birarda
|
59a6fa8953
|
reinstate an alphatbetical ordering in root CMakeLists
|
2013-05-17 17:52:23 -07:00 |
|
birarda
|
3d9e857c83
|
Merge pull request #343 from Ventrella/master
fixed weird pitch negation in head, and cleaned up some head formatting
|
2013-05-17 17:51:33 -07:00 |
|
birarda
|
438191f436
|
Merge pull request #348 from ZappoMan/voxel_animation
Improved Animation Server
|
2013-05-17 16:15:49 -07:00 |
|
ZappoMan
|
81fd3bbc6a
|
CR feedback
|
2013-05-17 16:15:05 -07:00 |
|
ZappoMan
|
60ce5f6de7
|
CR feedback
|
2013-05-17 16:12:35 -07:00 |
|
ZappoMan
|
16398be88d
|
CR feedback
|
2013-05-17 16:11:17 -07:00 |
|
ZappoMan
|
d0b1d49b5d
|
reduce packets per second by packing multiple voxel edits into single packet and removed debugging
|
2013-05-17 15:53:55 -07:00 |
|
birarda
|
1b29c6a6d3
|
Merge pull request #347 from birarda/voxel-noise
new audio injector setup fixes
|
2013-05-17 15:43:32 -07:00 |
|
Stephen Birarda
|
00998ba75e
|
some fixes for new audio injector setup
|
2013-05-17 15:42:37 -07:00 |
|
birarda
|
c3288f6f89
|
Merge pull request #346 from birarda/voxel-noise
fix broken eve
|
2013-05-17 15:22:48 -07:00 |
|
Stephen Birarda
|
0d769329bf
|
fix broken eve due to extra quote
|
2013-05-17 15:22:21 -07:00 |
|
birarda
|
b895f453ea
|
Merge pull request #345 from birarda/voxel-noise
fix memcmp in audio-mixer main
|
2013-05-17 15:20:48 -07:00 |
|
Stephen Birarda
|
cfe4783fff
|
correct the memcmp for audio stream identifier
|
2013-05-17 15:19:15 -07: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 |
|
Jeffrey Ventrella
|
f5dc5b0a39
|
thingy
|
2013-05-17 14:57:15 -07:00 |
|
Stephen Birarda
|
d72b931ebe
|
attach stream identifier to AudioRingBuffer to match incoming data in audio mixer
|
2013-05-17 14:57:10 -07:00 |
|
Jeffrey Ventrella
|
f099702d2a
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-17 14:56:51 -07:00 |
|
Jeffrey Ventrella
|
f2af37801e
|
tidied up the head class and fixed a negated pitch value in orientation
|
2013-05-17 14:56:14 -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
|
726a67c6c8
|
CR feedback
|
2013-05-17 13:55:26 -07:00 |
|
ZappoMan
|
2edc46ca5f
|
tweaks to animations
|
2013-05-17 13:21:35 -07:00 |
|
ZappoMan
|
316da59da3
|
first cut at animation server
|
2013-05-17 12:44:39 -07:00 |
|
ZappoMan
|
75fea2f1ba
|
Merge pull request #339 from birarda/no-copy
remove ability to copy AgentData and subclasses
|
2013-05-17 12:41:14 -07:00 |
|
Stephen Birarda
|
fc0448a148
|
disallow copying of VoxelSystem objects
|
2013-05-17 12:32:42 -07:00 |
|
Stephen Birarda
|
7e766eb351
|
fix eve's use of the now disallowed copy constructor
|
2013-05-17 12:31:16 -07:00 |
|
Stephen Birarda
|
c26a05ff97
|
disallow copying of VoxelAgentData objects
|
2013-05-17 12:31:00 -07:00 |
|
Stephen Birarda
|
fcfe5c9e25
|
disallow copying for AudioRingBuffer objects
|
2013-05-17 12:27:05 -07:00 |
|
Stephen Birarda
|
3e65d5a548
|
inline getters and setters in Avatar
|
2013-05-17 12:25:00 -07:00 |
|
Stephen Birarda
|
fb2f36519d
|
inline getters and setters in AvatarData
|
2013-05-17 12:19:19 -07:00 |
|
Stephen Birarda
|
1ba1b56b2c
|
disallow copying of Avatar objects
|
2013-05-17 12:15:19 -07:00 |
|
Stephen Birarda
|
199853711f
|
disallow copying of AvatarData objects
|
2013-05-17 12:15:10 -07:00 |
|
Stephen Birarda
|
12bf23e4c8
|
disallow Agent copying
|
2013-05-17 12:14:44 -07:00 |
|
ZappoMan
|
2c17f04d40
|
Merge pull request #338 from birarda/avatar-refactor
refactor the Head class to not keep its sphere and use default copy constructor
|
2013-05-17 11:10:04 -07:00 |
|
Stephen Birarda
|
ce7918108c
|
remove a lingering comment
|
2013-05-17 11:09:23 -07:00 |
|
Stephen Birarda
|
194035e464
|
repair indentation in Head constructor
|
2013-05-17 11:08:44 -07:00 |
|