Commit graph

5392 commits

Author SHA1 Message Date
ZappoMan
25350e99a3 fix whitespace 2013-08-08 14:49:16 -07:00
ZappoMan
205ba7c642 drop default Packets per second 2013-08-08 14:45:35 -07:00
ZappoMan
1bb7d75794 added tool for splitting SVOs on jurisdiction boundaries 2013-08-08 14:36:42 -07:00
ZappoMan
6d4ebda1ff fix delete local voxels in case of last voxel server going away 2013-08-08 14:30:46 -07:00
ZappoMan
48e35ec6cb fix delete local voxels in case of last voxel server going away 2013-08-08 14:29:58 -07:00
ZappoMan
8addfdc433 add --domain and --MinimalEnvironment to voxel-server 2013-08-08 12:54:34 -07:00
ZappoMan
647c176631 make voxel server fades slightly smaller than bounds to prevent z-fighting 2013-08-08 09:57:48 -07:00
ZappoMan
f2a9d0563a Merge pull request #827 from machinelevel/dev4
Rave tweak: noise reduction
2013-08-07 21:16:59 -07:00
Philip Rosedale
e0eced4603 Merge pull request #828 from ey6es/master
Fix for gyros' freaking out when disconnected.
2013-08-07 19:37:23 -07:00
ZappoMan
de068f6e72 Merge pull request #829 from ZappoMan/master
implement --domain in audio-mixer
2013-08-07 19:31:39 -07:00
ZappoMan
5c83942842 implement --domain in audio-mixer 2013-08-07 19:30:49 -07:00
Andrzej Kapolka
9d7b22e065 Recompiled OS X driver. 2013-08-07 18:40:52 -07:00
Eric Johnston
97d1c5bcbf Rave tweak: noise reduction
…by putting a smart cap on particle chain distances
2013-08-07 18:03:59 -07:00
Andrzej Kapolka
55a010a1a0 And also, close the file descriptor and print a message. 2013-08-07 18:02:38 -07:00
Andrzej Kapolka
f171b76f69 Fix for gyros' freaking out when disconnected. 2013-08-07 17:54:02 -07:00
ZappoMan
7a24a56670 Merge pull request #824 from machinelevel/dev4
Rave tweaks: Improvements to finger trails and hand rendering
2013-08-07 17:16:53 -07:00
Eric Johnston
a20668951a Merge branch 'master' of git://github.com/worklist/hifi into dev4 2013-08-07 17:06:43 -07:00
ZappoMan
62f5bb0212 Merge pull request #826 from birarda/master
socket changes to send proper port to pairing server
2013-08-07 16:47:07 -07:00
Stephen Birarda
655a27b257 Merge pull request #825 from Atlante45/master
Fix other avatar not rendered in first person
2013-08-07 16:44:23 -07:00
Stephen Birarda
2a21ce7945 socket changes to send correct port to pairing server 2013-08-07 16:40:28 -07:00
atlante45
4449b46466 Fix other avatar not rendered in first person 2013-08-07 16:38:02 -07:00
Eric Johnston
524e5dd130 Fixed fencepost error to make trails slightly cleaner 2013-08-07 16:33:38 -07:00
Andrzej Kapolka
9dbec35f6a Merge pull request #823 from ZappoMan/master
Display Frustum and resizeGL() cleanup
2013-08-07 16:29:34 -07:00
ZappoMan
cb211fbb04 CR feedback 2013-08-07 16:27:43 -07:00
Eric Johnston
a01b36c7a5 Merge branch 'master' of git://github.com/worklist/hifi into dev4 2013-08-07 16:22:21 -07:00
Eric Johnston
52b33cb466 Rave tweaks: Improvements to finger trails and hand rendering 2013-08-07 16:19:54 -07:00
ZappoMan
9f5f7d96da Merge pull request #820 from Atlante45/master
Display leap hand and rave glove in first person mode
2013-08-07 16:17:37 -07:00
ZappoMan
85d5f86046 Merge pull request #821 from PhilipRosedale/master
Rotation stops faster
2013-08-07 16:16:54 -07:00
Andrzej Kapolka
f1dc26e597 Merge pull request #822 from LionTurtle/master
Resize half cylinder backing to texture in full frame mode.
2013-08-07 16:14:44 -07:00
ZappoMan
f4820143d7 cleanup resizeGL, and Display Frustum menus 2013-08-07 16:12:03 -07:00
Hifi Test Account
38651a6a40 Translate half cylinder backing rather than rotate a 2nd one. 2013-08-07 16:04:45 -07:00
ZappoMan
40025618e0 Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	interface/src/Application.cpp
	interface/src/Camera.cpp
2013-08-07 15:49:34 -07:00
Hifi Test Account
8cadca4ce7 Resize half cylinder backing to texture in full frame mode. 2013-08-07 15:35:12 -07:00
Hifi Test Account
205ce83238 Merge remote-tracking branch 'upstream/master' 2013-08-07 15:15:27 -07:00
atlante45
b6adb14a16 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 14:51:09 -07:00
atlante45
20fea6b0ad Height relative collision rdius when not in first person 2013-08-07 14:50:35 -07:00
ZappoMan
d2d8bad241 simplified frustum camera mode, fixed resizeGL in case of frustum being on 2013-08-07 14:47:36 -07:00
Philip Rosedale
a4d1bc5b6e Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 14:43:49 -07:00
Andrzej Kapolka
a8099c93c0 Merge pull request #806 from LionTurtle/master
Add renderHalfCylinder function and render a static half cylinder behind the face in full frame mode.
2013-08-07 14:43:04 -07:00
Philip Rosedale
0445da3221 Stop rotating more quickly, display avatar position and yaw stats 2013-08-07 14:42:57 -07:00
atlante45
6fb76d3dfe Merge branch 'master' of https://github.com/worklist/hifi 2013-08-07 14:30:18 -07:00
atlante45
c48652c2c3 Display leap hand and rave glove in first person mode 2013-08-07 14:28:21 -07:00
Andrzej Kapolka
b8b0761333 Merge pull request #819 from ey6es/master
Terminology fix: OpenGL fields of view are vertical, not horizontal.
2013-08-07 14:28:16 -07:00
Andrzej Kapolka
d3b7a31e3b Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	interface/src/Camera.cpp
2013-08-07 14:27:17 -07:00
Andrzej Kapolka
e9b3cca3de OpenGL fields of view are vertical, not horizontal. 2013-08-07 14:26:22 -07:00
ZappoMan
a9ee3be0d0 Merge pull request #818 from Atlante45/master
Colliding fixes
2013-08-07 14:19:38 -07:00
atlante45
81446f13d5 Fix head not colliding with voxels and environement 2013-08-07 14:18:02 -07:00
atlante45
d0461e36f1 Fix no collision when offset camera on from the beginning 2013-08-07 14:16:49 -07:00
Philip Rosedale
0d26bb4266 Camera always stops moving when using gyro's 2013-08-07 14:08:30 -07:00
Hifi Test Account
3e136e36f4 Merge remote-tracking branch 'upstream/master' 2013-08-07 13:55:47 -07:00