Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 20:46:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2360 commits 25 branches 0 tags 1.1 GiB
Commit graph

2360 commits

This branch
This branch
All branches
Author SHA1 Message Date
birarda
36c95bdee4 Merge pull request #234 from birarda/master 
fix other avatar unpacking from avatar mixer bulk packet
 2013-05-07 14:58:05 -07:00
Stephen Birarda
e8fbfcab05 fix unpacking of other avatars in avatar mixer bulk packet 2013-05-07 14:57:24 -07:00
Andrzej Kapolka
e40edd07e4 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-07 14:44:33 -07:00
Andrzej Kapolka
c7e31ec414 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/shared/src/PacketHeaders.h
 2013-05-07 14:44:17 -07:00
birarda
a28f345847 Merge pull request #233 from birarda/master 
spacing cleanup
 2013-05-07 14:41:44 -07:00
Stephen Birarda
6bad72a18e spacing cleanup in audio-mixer main 2013-05-07 14:41:20 -07:00
Andrzej Kapolka
47f3566929 Wavelengths, switch for environment rendering, far plane adjustment. 2013-05-07 14:40:30 -07:00
birarda
e69b0c17a3 Merge pull request #232 from birarda/master 
variable fixes for audio mixer loopback
 2013-05-07 14:32:44 -07:00
Stephen Birarda
a87e0d7f7f variable fixes for audio-mixer loopback 2013-05-07 14:32:15 -07:00
birarda
68ead2f309 Merge pull request #231 from birarda/master 
fix loopback from audio mixer
 2013-05-07 14:30:29 -07:00
Stephen Birarda
82cff262b1 for agent loopback perform no distance and angle calculations 2013-05-07 14:28:48 -07:00
birarda
ff5fb0f729 Merge pull request #230 from birarda/master 
fix audio mixer loopback
 2013-05-07 13:50:27 -07:00
Stephen Birarda
00c11d82b2 if the agent stops asking for loopback make sure the flag is set false 2013-05-07 13:50:01 -07:00
ZappoMan
ab82bfc9d8 Merge pull request #229 from birarda/interface-send-id 
make eve send her ID to identify with the avatar mixer
 2013-05-07 13:47:50 -07:00
Stephen Birarda
3719454abd use constants for eve's hand grabbing behavior 2013-05-07 13:47:12 -07:00
Stephen Birarda
92daa8e6e0 revert the type squish 2013-05-07 13:43:07 -07:00
Stephen Birarda
9be92cebdd revert type squish, spacing, code review comment 2013-05-07 13:41:48 -07:00
Stephen Birarda
d5d9479b65 make eve send her ID to identify with the avatar mixer 2013-05-07 13:38:56 -07:00
Philip Rosedale
0ae700d746 Merge remote-tracking branch 'upstream/master' 2013-05-07 12:53:19 -07:00
Philip Rosedale
e1645b1158 Testing audio noise generation at client 2013-05-07 12:48:35 -07:00
ZappoMan
cdc5112497 Merge pull request #228 from birarda/interface-send-id 
have interface send ID to AM and VS
 2013-05-07 12:45:49 -07:00
Stephen Birarda
0566330a8a some magic number removals 2013-05-07 12:44:45 -07:00
Stephen Birarda
5ccc6d6d20 prefer sizeOf to hardcoded byte 2013-05-07 12:42:10 -07:00
Andrzej Kapolka
7faa9e4318 More work on atmosphere rendering; rendering now working. 2013-05-07 12:40:15 -07:00
Stephen Birarda
85dfb23fbd add constant for UNKNOWN_AGENT_ID 2013-05-07 12:39:35 -07:00
Stephen Birarda
83e59b1aa8 more deletions 2013-05-07 12:05:32 -07:00
Stephen Birarda
5c90b4575e trivial deletions for cleanup 2013-05-07 12:05:25 -07:00
Stephen Birarda
4eeb1ed5b1 have interface clients tell the avatar-mixer and voxel-server what their ID is 2013-05-07 12:05:19 -07:00
Stephen Birarda
722205682e expect domain server to append one's own ID to end of packet 2013-05-07 12:05:13 -07:00
Stephen Birarda
43a3775633 add _ownerID member variable to AgentList 2013-05-07 12:05:06 -07:00
Stephen Birarda
589e524090 remove debugging and a couple of lines 2013-05-07 12:04:59 -07:00
Philip Rosedale
331d4116d9 Finished noiseTest example (in util.h) that uses Perlin noise to draw a bitmap in 2D. 2013-05-07 11:14:12 -07:00
Philip Rosedale
54eec42559 Merge pull request #224 from PhilipRosedale/master 
Fixed avatar chat location, adding noiseTest() function for using perlin noise
 2013-05-07 10:48:10 -07:00
Philip Rosedale
be1b803656 Noise Test function, adjust chat position 2013-05-07 10:41:39 -07:00
Philip Rosedale
0de9afeef1 Merge pull request #221 from PhilipRosedale/master 
Added utility function for angleBetween() to help with audio attenuation and other code
 2013-05-07 10:00:29 -07:00
Philip Rosedale
27540f1286 Fixes per code review 2013-05-07 09:59:37 -07:00
Jeffrey Ventrella
d99eef8c99 Merge remote-tracking branch 'upstream/master' 2013-05-07 08:43:44 -07:00
Jeffrey Ventrella
fe11d929e3 cleaned up code spacing 2013-05-07 08:43:14 -07:00
Philip Rosedale
3afb1dc7a8 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-07 08:40:43 -07:00
Philip Rosedale
c7635604a9 Fixes in merge. 2013-05-07 08:40:11 -07:00
Philip Rosedale
082b58ea5b Merge pull request #222 from ZappoMan/render_voxels_optimization 
Make sure that TREE_SCALE works for something other than 10
 2013-05-07 08:38:57 -07:00
Jeffrey Ventrella
33d58b45f3 Merge pull request #220 from Ventrella/master 
lots of changes to improve avatar touch
 2013-05-06 22:25:18 -07:00
Jeffrey Ventrella
65181cb4e0 changed some spacing formatting things 2013-05-06 22:23:16 -07:00
ZappoMan
f45bb8c455 fix comment 2013-05-06 21:30:47 -07:00
ZappoMan
e05b74f252 cleaned up code in addScene() 2013-05-06 21:08:06 -07:00
ZappoMan
d11e490b62 cleaned up code in createSphere() 2013-05-06 21:07:42 -07:00
ZappoMan
94473d6b95 made TREE_SCALE 100 2013-05-06 21:07:10 -07:00
Philip Rosedale
31593dccd4 improved comment of function 2013-05-06 18:46:19 -07:00
Philip Rosedale
00c8673ceb Added Utility function angleBetween() which returns the positive angle between any two 3D vectors. 2013-05-06 18:45:06 -07:00
Jeffrey Ventrella
ef76c6ba0a Merge remote-tracking branch 'upstream/master' 2013-05-06 18:29:42 -07:00