Andrzej Kapolka
|
1828a105d4
|
Basic glow effect.
|
2013-08-08 16:55:45 -07:00 |
|
Andrzej Kapolka
|
5bca763c14
|
Merge branch 'master' of https://github.com/worklist/hifi into glow
|
2013-08-08 13:58:53 -07:00 |
|
Andrzej Kapolka
|
65b2aebea9
|
Merge pull request #835 from ZappoMan/master
add --domain and --MinimalEnvironment to voxel-server
|
2013-08-08 13:55:48 -07:00 |
|
ZappoMan
|
f7b773d6a6
|
Merge pull request #834 from ey6es/master
Update the *other* avatar mixer bandwidth stats.
|
2013-08-08 13:36:58 -07:00 |
|
ZappoMan
|
8addfdc433
|
add --domain and --MinimalEnvironment to voxel-server
|
2013-08-08 12:54:34 -07:00 |
|
Andrzej Kapolka
|
c929f67cc4
|
Update the *other* avatar mixer bandwidth stats.
|
2013-08-08 12:33:31 -07:00 |
|
Stephen Birarda
|
61003335bb
|
Merge pull request #833 from birarda/assignee
add assignment-server to jobs.groovy
|
2013-08-08 12:14:28 -07:00 |
|
Stephen Birarda
|
957549ddd6
|
add a job to build and deploy the assignment server
|
2013-08-08 12:14:03 -07:00 |
|
ZappoMan
|
7e5f03a36f
|
Merge pull request #832 from birarda/assignee
tweaks to assignment server and AvatarData for assignment to iOS
|
2013-08-08 12:13:07 -07:00 |
|
Stephen Birarda
|
f60cbed709
|
fix packet size of assignment packet
|
2013-08-08 12:09:59 -07:00 |
|
Andrzej Kapolka
|
cb89f05a39
|
Merge branch 'master' of https://github.com/worklist/hifi into glow
|
2013-08-08 12:01:03 -07:00 |
|
Stephen Birarda
|
287bead0b7
|
add extra debugging to assignment server
|
2013-08-08 11:22:02 -07:00 |
|
Stephen Birarda
|
94d270b3d5
|
remove equals at beginning of AvatarData
|
2013-08-08 11:21:39 -07:00 |
|
Andrzej Kapolka
|
4279d508b7
|
Merge pull request #831 from ey6es/master
Disable specular highlights for ground and voxels.
|
2013-08-08 11:03:30 -07:00 |
|
Andrzej Kapolka
|
29912d053a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-08-08 11:02:59 -07:00 |
|
Andrzej Kapolka
|
3855b7c0a1
|
Merge pull request #830 from ZappoMan/master
make voxel server fades slightly smaller than bounds to prevent z-fighting
|
2013-08-08 11:02:17 -07:00 |
|
Andrzej Kapolka
|
aca15d4aef
|
Disable specular highlights for ground and voxels.
|
2013-08-08 10:59:01 -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 |
|
Stephen Birarda
|
a6cf3be4c4
|
only keep one assignment in assignment-server for demo
|
2013-08-07 15:52:04 -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 |
|