Andrzej Kapolka
310c0288c7
Changed atmosphere radius to 1000 meters.
2013-05-08 10:31:13 -07:00
Andrzej Kapolka
8895cbeb6c
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 10:01:34 -07:00
Jeffrey Ventrella
9d17df27bf
Merge remote-tracking branch 'upstream/master'
2013-05-07 18:33:21 -07:00
Jeffrey Ventrella
2d8c15e0cb
cleaned up some spacing issues in Orientarion class
2013-05-07 18:32:56 -07:00
Andrzej Kapolka
44f596653e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:50:27 -07:00
Andrzej Kapolka
7c8a06ed4d
Added wrapper classes for shaders/shader programs to ease the process of
...
compiling, linking, assigning uniforms, etc. They're modeled after the ones
included in QtOpenGL, which we can't use at the moment because they require
a Qt OpenGL context.
2013-05-07 17:40:55 -07:00
Stephen Birarda
9658c40dd6
change lastAgentId member variable to _lastAgentID
2013-05-07 17:17:47 -07:00
Andrzej Kapolka
a1c3e8515d
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 15:11:55 -07:00
Stephen Birarda
8daae1dd1d
bring eve closer to the ground after scale changes
2013-05-07 15:11:01 -07:00
Andrzej Kapolka
b245e16623
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 15:10:55 -07:00
Andrzej Kapolka
7c9b0d8f58
Have the voxel server push out an environment packet with its regular updates.
2013-05-07 15:10:02 -07:00
Stephen Birarda
11b2271b91
size of agent ID must be included in bytes read per avatar
2013-05-07 15:05:31 -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
c7e31ec414
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/shared/src/PacketHeaders.h
2013-05-07 14:44:17 -07:00
Andrzej Kapolka
47f3566929
Wavelengths, switch for environment rendering, far plane adjustment.
2013-05-07 14:40:30 -07:00
Stephen Birarda
82cff262b1
for agent loopback perform no distance and angle calculations
2013-05-07 14:28:48 -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
Stephen Birarda
d5d9479b65
make eve send her ID to identify with the avatar mixer
2013-05-07 13:38:56 -07:00
Stephen Birarda
0566330a8a
some magic number removals
2013-05-07 12:44:45 -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
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
Philip Rosedale
3afb1dc7a8
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 08:40:43 -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
631ee8f478
Merge remote-tracking branch 'upstream/master'
2013-05-06 18:23:06 -07:00
Philip Rosedale
69cac10cee
null change
2013-05-06 18:21:33 -07:00
Philip Rosedale
ef68ef9c5d
Merge pull request #217 from birarda/off-axis
...
add off-axis attenuation to audio
2013-05-06 18:18:23 -07:00
Stephen Birarda
81fade33dc
refactoring in audio mixer in preparation for off axis attenuation
2013-05-06 17:07:57 -07:00
ZappoMan
bccad01e0e
fixed CR issue
2013-05-06 16:47:31 -07:00
ZappoMan
342e3e0407
fixed CR issue
2013-05-06 16:43:25 -07:00
ZappoMan
c2588e0120
fixed CR issue
2013-05-06 16:42:12 -07:00
ZappoMan
cfbcc4418f
some cleanup pre CR
2013-05-06 16:34:34 -07:00
ZappoMan
37b165c8e9
some cleanup pre CR
2013-05-06 16:30:34 -07:00
ZappoMan
f5808f43b5
some cleanup pre CR
2013-05-06 16:24:09 -07:00
ZappoMan
9fb57feb3b
some cleanup pre CR
2013-05-06 16:21:58 -07:00
ZappoMan
239aa1ed49
some cleanup pre CR
2013-05-06 16:18:30 -07:00
ZappoMan
dc481002ec
fixed Xcode compiler warnings
2013-05-06 16:00:43 -07:00
ZappoMan
35c840fefa
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-06 15:57:44 -07:00
ZappoMan
89226b18a5
switched getAABox() interface
2013-05-06 15:50:42 -07:00
ZappoMan
96561e97d8
added VIEW_CULLING_RATE_IN_MILLISECONDS
2013-05-06 15:49:54 -07:00
ZappoMan
c975699cea
added debug to ViewFrustum::matches()
2013-05-06 15:48:05 -07:00
Stephen Birarda
90a8027f69
include cstdlib for call to exit
2013-05-06 15:36:48 -07:00
Stephen Birarda
c742c292b6
have the audio mixer output a stacktrace when it crashes
2013-05-06 15:29:21 -07:00
ZappoMan
043a284d4d
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-06 13:36:31 -07:00
Andrzej Kapolka
2226d722cf
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/shared/src/PacketHeaders.h
2013-05-06 13:31:46 -07:00
Andrzej Kapolka
b4dd6b57aa
Starting on environment bits.
2013-05-06 13:30:07 -07:00
Stephen Birarda
499899c6e0
if there are no active agents in list begin() iterator should be end()
2013-05-06 13:11:40 -07:00