Philip Rosedale
|
61d4ac2675
|
Fixes per code review.
|
2013-06-06 09:52:39 -07:00 |
|
Philip Rosedale
|
24dcd14371
|
Added sensor fusion for more stable gyro roll, pitch.
|
2013-06-05 23:53:01 -07:00 |
|
Philip Rosedale
|
1b20b016dd
|
Fixed acceleration checking bug that was limiting angular rotation, changed mouselook to work correctly/stable.
|
2013-06-05 20:04:30 -07:00 |
|
Philip Rosedale
|
1f0e321980
|
removed Oculus Manager from camera object, using _tightness = 0.0 to shutoff camera movement smoothing
|
2013-06-05 17:54:14 -07:00 |
|
Philip Rosedale
|
97be04716e
|
Added render menu choice to switch between voxel and ball avatar rendering.
|
2013-06-05 17:24:53 -07:00 |
|
Philip Rosedale
|
07405ef280
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-05 16:55:12 -07:00 |
|
Andrzej Kapolka
|
6c3425a642
|
Fix for URL decoding.
|
2013-06-05 15:39:37 -07:00 |
|
Andrzej Kapolka
|
b9e2e26ab1
|
Don't restart the download when we're given the same URL.
|
2013-06-05 14:59:08 -07:00 |
|
Andrzej Kapolka
|
a4aa8e7bde
|
Basic sharing of the avatar voxel URLs.
|
2013-06-05 14:55:49 -07:00 |
|
Andrzej Kapolka
|
69dd4ff59b
|
Improved rotation computation.
|
2013-06-05 13:08:17 -07:00 |
|
Philip Rosedale
|
b38c68ab20
|
remove unused setHeadFromGyros() routine - confusing.
|
2013-06-05 10:46:55 -07:00 |
|
Andrzej Kapolka
|
391b62ed32
|
Make sure we don't hear back from replies after we've cleared them.
|
2013-06-05 10:34:41 -07:00 |
|
Philip Rosedale
|
5fbf9f8714
|
gyro look off by default
|
2013-06-05 10:23:52 -07:00 |
|
Philip Rosedale
|
29c4374dc0
|
Merge fixes for brad, reversed pitch direction to correct mouse look
|
2013-06-05 09:59:39 -07:00 |
|
Philip Rosedale
|
626dcd0875
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-05 09:40:42 -07:00 |
|
ZappoMan
|
9310876531
|
Merge pull request #485 from birarda/cube-injector
spherical audio injector and quaternion rotations for audio
|
2013-06-05 09:37:38 -07:00 |
|
ZappoMan
|
3bce3f7a62
|
support file:// urls for avitar voxles
|
2013-06-05 00:53:27 -07:00 |
|
Philip Rosedale
|
8719b9f9d4
|
merge fix
|
2013-06-04 21:26:53 -07:00 |
|
Andrzej Kapolka
|
c953fc743d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-04 18:00:01 -07:00 |
|
ZappoMan
|
b75bd80de7
|
fix build busters
|
2013-06-04 17:54:48 -07:00 |
|
Andrzej Kapolka
|
f708649546
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-04 17:44:53 -07:00 |
|
Andrzej Kapolka
|
b30b64c5b5
|
Use downloadProgress rather than isFinished (which worked on files, but didn't
on HTTP URLs).
|
2013-06-04 17:44:19 -07:00 |
|
ZappoMan
|
f66641f1b4
|
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
|
2013-06-04 17:41:41 -07:00 |
|
ZappoMan
|
26542d44c9
|
Merge pull request #478 from Atlante45/master
Settings handling with QSettings
|
2013-06-04 17:41:02 -07:00 |
|
ZappoMan
|
4f2af717f2
|
Fixed merge issue with new orientation vectors, migrated to common identity names
|
2013-06-04 17:27:40 -07:00 |
|
Andrzej Kapolka
|
ad377e6256
|
We can't initialize avatars from the network thread; they need access to the
OpenGL context.
|
2013-06-04 17:25:04 -07:00 |
|
Philip Rosedale
|
4db6e9074e
|
merge conflict fix
|
2013-06-04 17:11:33 -07:00 |
|
atlante45
|
d539ea283e
|
Merge 19358 with upstream Master
|
2013-06-05 01:43:47 +02:00 |
|
ZappoMan
|
6e70f3b187
|
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
|
2013-06-04 16:21:20 -07:00 |
|
Andrzej Kapolka
|
93b50f44f5
|
Add a reasonable minimum size for the URL field.
|
2013-06-04 15:59:07 -07:00 |
|
Andrzej Kapolka
|
b856af505a
|
Adjusted default bind radius, spring vector threshold.
|
2013-06-04 15:52:39 -07:00 |
|
Stephen Birarda
|
7d3d8f8b43
|
rewrite the AudioInjector to send an orientation quaternion instead of bearing
|
2013-06-04 15:31:11 -07:00 |
|
Stephen Birarda
|
0f70c9c06b
|
send full quaternion orientation instead of just bearing to audio-mixer
|
2013-06-04 12:52:09 -07:00 |
|
Andrzej Kapolka
|
d09700adde
|
Merge branch 'master' of https://github.com/worklist/hifi into voxeltars
Conflicts:
interface/src/Avatar.cpp
interface/src/Avatar.h
interface/src/Skeleton.h
interface/src/VoxelSystem.h
|
2013-06-04 11:00:59 -07:00 |
|
Andrzej Kapolka
|
90a53bc518
|
Only bind vertices within an adjustable radius.
|
2013-06-04 10:40:08 -07:00 |
|
Andrzej Kapolka
|
bc8eadd526
|
More work on voxeltars; separated default pose from bind pose.
|
2013-06-04 10:22:58 -07:00 |
|
atlante45
|
c199190666
|
Fixes asked by ZappoMan on QSettings' commit.
|
2013-06-04 19:00:38 +02:00 |
|
ZappoMan
|
edf6e767f0
|
removed unused variable
|
2013-06-04 09:35:38 -07:00 |
|
ZappoMan
|
026fb5b344
|
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
|
2013-06-04 09:34:37 -07:00 |
|
Philip Rosedale
|
60100fd473
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-04 09:09:39 -07:00 |
|
ZappoMan
|
ce499f925a
|
add cut voxels
|
2013-06-04 09:02:34 -07:00 |
|
ZappoMan
|
626874f9ec
|
add delete key support while in select mode
|
2013-06-04 08:47:57 -07:00 |
|
ZappoMan
|
743e1a433c
|
make import/export default to desktop
|
2013-06-04 01:24:35 -07:00 |
|
ZappoMan
|
4f3872c18f
|
CR feedback
|
2013-06-04 01:13:58 -07:00 |
|
ZappoMan
|
0a9b3bf5ce
|
changed file name and exention to Sparse Voxel Octree and svo
|
2013-06-04 01:07:18 -07:00 |
|
ZappoMan
|
435791f28c
|
CR feedback
|
2013-06-04 01:02:10 -07:00 |
|
ZappoMan
|
eef0636655
|
some cleanup
|
2013-06-03 21:53:06 -07:00 |
|
ZappoMan
|
510dfc7353
|
Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization
|
2013-06-03 21:43:38 -07:00 |
|
ZappoMan
|
05e8c8806c
|
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
|
2013-06-03 21:28:23 -07:00 |
|
ZappoMan
|
cf3ff53e2c
|
copy and paste working
|
2013-06-03 18:08:11 -07:00 |
|