Commit graph

7423 commits

Author SHA1 Message Date
ZappoMan
9784288b63 added some debugging 2013-11-21 13:51:40 -08:00
ZappoMan
e2e9c29824 implement old vs new side by side encoding to test for correctness 2013-11-21 13:26:28 -08:00
ZappoMan
6c640752cd make compression optional 2013-11-21 12:04:13 -08:00
ZappoMan
a590f384a6 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-21 11:33:08 -08:00
Andrzej Kapolka
ea467c5341 Merge pull request #1283 from ZappoMan/keep_local_voxels
fix potential crashing bug related to incorrectly initialized memory
2013-11-21 11:28:55 -08:00
ZappoMan
e959be82f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-11-21 11:18:47 -08:00
ZappoMan
f116fbaf8c Merge pull request #1282 from ey6es/sicksense
Support for Razer Hydra, driving avatar using lean (from Faceshift) or Leap.
2013-11-21 11:14:26 -08:00
Andrzej Kapolka
7bc65136c7 Merge branch 'master' of https://github.com/worklist/hifi into sicksense 2013-11-21 11:00:09 -08:00
Andrzej Kapolka
cd4ef08dae Merge pull request #1272 from ZappoMan/stats_crash_bug_fix
fix to crash in client side VoxelSceneStats crash
2013-11-21 10:59:57 -08:00
Andrzej Kapolka
fdb84e5278 Merge pull request #1271 from ZappoMan/fix_menus
fix macos menu placement for About, Preferences, and Quit
2013-11-21 10:53:51 -08:00
Andrzej Kapolka
b4938b7a47 Merge pull request #1276 from ZappoMan/voxel_edit
Add --decodeOctalCode to voxel-edit
2013-11-21 10:52:59 -08:00
Andrzej Kapolka
9adeced651 Merge pull request #1281 from ZappoMan/voxel_stats
fix a couple of bugs in display of voxel stats on server status
2013-11-21 10:51:45 -08:00
Andrzej Kapolka
fb46a637fb Merge branch 'master' of https://github.com/worklist/hifi into sicksense 2013-11-21 10:49:58 -08:00
ZappoMan
cb56ad2e2f fix a couple of bugs in display of voxel stats on server status 2013-11-21 10:43:40 -08:00
ZappoMan
6881d9fb36 fix to crash in client side VoxelSceneStats crash 2013-11-19 22:57:42 -08:00
Andrzej Kapolka
4e952b0f99 Clamp pitch from touch when adjusting it. 2013-11-19 16:40:29 -08:00
Andrzej Kapolka
69b5b81f34 Limit combined pitch. 2013-11-19 16:31:24 -08:00
ZappoMan
8c90e96740 addeding VoxelPacket class for encoding bit streams 2013-11-19 15:36:21 -08:00
Andrzej Kapolka
80e6606dd2 Adjusted constants, added reasonable starting base position. 2013-11-19 15:31:04 -08:00
Andrzej Kapolka
38c2abd6d8 First stab at Leap driving. 2013-11-19 15:10:02 -08:00
Andrzej Kapolka
bc523092ba Sniffing glue, wrong week, etc. 2013-11-19 11:59:25 -08:00
Andrzej Kapolka
ced1fca2e4 Missed another spot. 2013-11-19 11:57:01 -08:00
Andrzej Kapolka
3d82fe65b4 Forgot this part. 2013-11-19 11:53:57 -08:00
Andrzej Kapolka
1e7866ad02 Clamped values, adjusted them. 2013-11-19 11:51:32 -08:00
Andrzej Kapolka
df8fbf8f72 More general, angle-driven form of driving based on lean. 2013-11-19 11:09:02 -08:00
Andrzej Kapolka
5e933b0815 Working on basic Faceshift drive. 2013-11-18 18:06:01 -08:00
Andrzej Kapolka
f59b403103 Drive avatar with Sixense joysticks and triggers. 2013-11-18 16:20:00 -08:00
Andrzej Kapolka
83d89cdc30 Path fix for readme. 2013-11-18 12:34:38 -08:00
Andrzej Kapolka
6d9bd6d2b0 Gitignore additions. 2013-11-18 12:16:25 -08:00
Andrzej Kapolka
0231ed133c Optional compilation for Sixense. 2013-11-18 12:09:52 -08:00
ZappoMan
c2cb6df61c first cut at compresses voxel packets 2013-11-18 09:46:32 -08:00
ZappoMan
73c1ef9997 fix macos menu placement for About, Preferences, and Quit 2013-11-17 00:01:32 -08:00
Andrzej Kapolka
9c401607b1 Missed the actual files. 2013-11-15 18:47:25 -08:00
Andrzej Kapolka
1f2fe5ddee Rudimentary Sixense (Razer Hydra) support. 2013-11-15 18:06:32 -08:00
Stephen Birarda
893eadcb2f Merge pull request #1270 from ZappoMan/bugfixes
fix to crash on deleteNotify
2013-11-15 17:09:56 -08:00
ZappoMan
4da70cf3c8 fix to crash on deleteNotify 2013-11-15 16:45:03 -08:00
Philip Rosedale
ce4e99836b Merge pull request #1268 from ey6es/master
Fix for pupil dilation on Ryan's face.
2013-11-15 14:30:16 -08:00
Andrzej Kapolka
7249e5293c Added a slider in the preferences to control the amount of Faceshift eye
deflection.
2013-11-15 10:17:52 -08:00
Andrzej Kapolka
f7458cf934 Fix for pupil dilation on Ryan's face. 2013-11-14 15:21:54 -08:00
Andrzej Kapolka
01d29e3303 Merge pull request #1267 from ey6es/master
Couple of tiny fixes: head scales on remote avatars, disable mouse eye tracking in mirror mode.
2013-11-14 10:49:41 -08:00
Andrzej Kapolka
d3d2c344e6 Set the head scale for other avatars. 2013-11-14 10:46:56 -08:00
Andrzej Kapolka
c358b9f0fd Don't track the mouse in mirror mode. 2013-11-14 10:19:35 -08:00
Stephen Birarda
82649a9a49 Merge pull request #1261 from ZappoMan/paste_to_octalcode
add Paste To Voxel
2013-11-14 08:45:23 -08:00
ZappoMan
09c44d49ed Merge branch 'master' of https://github.com/worklist/hifi into paste_to_octalcode 2013-11-13 23:08:16 -08:00
ZappoMan
34668e8716 add Paste To Voxel 2013-11-13 23:04:51 -08:00
Philip Rosedale
266a0c8ed2 Merge pull request #1260 from ZappoMan/master
fix new VoxelPersistThread behavior so it's actually only checking dirty bits every each persist cycle
2013-11-13 21:46:47 -08:00
ZappoMan
1d272c333a fix new VoxelPersistThread behavior so it's actually only checking dirty bits every each persist cycle 2013-11-13 21:31:34 -08:00
Leonardo Murillo
8805531b00 Merge pull request #1259 from ZappoMan/bugfixes
added some debugging to see why the servers are spinning out constantly ...
2013-11-13 17:55:13 -08:00
ZappoMan
865d2d19f1 added some debugging to see why the servers are spinning out constantly checking for dirty tree 2013-11-13 17:29:01 -08:00
ZappoMan
3c17c70541 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-11-13 17:15:41 -08:00