Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3676 commits 25 branches 0 tags 1.1 GiB
Commit graph

1865 commits

Author SHA1 Message Date
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
Stephen Birarda
2db7b5de4e fix the number of bytes for microphone audio 2013-06-05 14:41:10 -07:00
Andrzej Kapolka
69dd4ff59b Improved rotation computation. 2013-06-05 13:08:17 -07:00
Stephen Birarda
beb415a851 correct buffer byte constants in AudioRingBuffer 2013-06-05 12:45:07 -07:00
Stephen Birarda
d64b46a6b2 add specialized parsing of audio data to ARB subclasses 2013-06-05 12:11:56 -07:00
Stephen Birarda
4cb00ad54b clean up AudioRingBuffer by subclassing 2013-06-05 11:51:21 -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
Stephen Birarda
6353940bf7 some extra cleanup after merge with upstream master 2013-06-05 09:59:33 -07:00
Stephen Birarda
eee7d6f92f resolve some conflicts on merge with upstream master 2013-06-05 09:56:26 -07:00
Stephen Birarda
6c2dcb86c8 Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-05 09:55:16 -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
Jeffrey Ventrella
cee2244364 fixed formatting things 2013-06-03 17:55:48 -07:00
Philip Rosedale
179e30fdfc Merge branch 'master' of https://github.com/worklist/hifi 2013-06-03 17:37:25 -07:00
Philip Rosedale
5e0a70c524 gyro look controls head offset on/off 2013-06-03 17:36:32 -07:00
Philip Rosedale
da343215ce Rename serialPort to serialHeadSensor, added passing of lean to eyeOffset 2013-06-03 17:25:20 -07:00
Andrzej Kapolka
6552a64bb4 Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-06-03 17:17:24 -07:00
Jeffrey Ventrella
da09dd3259 test 2013-06-03 17:16:52 -07:00
ZappoMan
0b7f4b21f4 Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-06-03 16:42:27 -07:00
Jeffrey Ventrella
3ff11d0eb8 test 2013-06-03 16:42:27 -07:00
Jeffrey Ventrella
b73eb66492 temp test 2013-06-03 16:31:39 -07:00
Jeffrey Ventrella
26bbb9917b more work on avatar touch 2013-06-03 16:23:55 -07:00
ZappoMan
0f2b736130 cleanup 2013-06-03 13:50:42 -07:00
ZappoMan
ea965f2290 fixed issue with sendVoxelsOperataion, some other cleanup 2013-06-03 13:46:21 -07:00
ZappoMan
c4b3b568e7 make import and export properly rebase 2013-06-03 13:13:52 -07:00
Andrzej Kapolka
73f8fca2af More work on voxeltars; added rotations. 2013-06-03 13:00:54 -07:00
Jeffrey Ventrella
e96503de0d Merge remote-tracking branch 'upstream/master' 2013-06-03 12:26:51 -07:00
Jeffrey Ventrella
6479a41206 more ball prep 2013-06-03 12:26:20 -07:00
ZappoMan
78fe89172a eyedropper mode, and import work 2013-06-03 12:23:16 -07:00
Stephen Birarda
0fedf354e0 don't attempt to send microphone audio if AgentList is NULL 2013-06-03 12:10:18 -07:00
Jeffrey Ventrella
00dce6b59e fix 2013-06-03 12:01:01 -07:00
Stephen Birarda
5a5b22db61 fix use of PI constant after merge with upstream master 2013-06-03 12:00:57 -07:00
Stephen Birarda
4348702dd2 Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-03 11:53:13 -07:00
Jeffrey Ventrella
8d031b5c2d preparation for extending the avatar ball array to accommodate more touch capabilities 2013-06-03 11:53:00 -07:00
ZappoMan
7dd217b318 more work on copy and paste 2013-06-03 10:57:18 -07:00
Andrzej Kapolka
a6daa296ff Slight fix to capsule/box penetration test: we should use the smaller distance 
to the diagonal, not the first one we find.
 2013-06-03 10:08:42 -07:00
Jeffrey Ventrella
9e046b74e6 working on avatar touch 2013-06-03 08:09:27 -07:00
Andrzej Kapolka
8d757e148f More work on voxeltars; basic skinning works. 2013-06-02 19:55:51 -07:00
atlante45
dccc44a6f5 Added settings management using QSettings 2013-06-02 14:58:51 +02:00
Andrzej Kapolka
35ae08def0 Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-06-01 15:07:00 -07:00
Andrzej Kapolka
6c975f9c6f More work on avatar voxels. 2013-06-01 15:06:29 -07:00
Andrzej Kapolka
7425b39237 Working on avatar voxel system. 2013-05-31 17:55:30 -07:00
Jeffrey Ventrella
de49d7fc6c more fixes 2013-05-31 17:32:30 -07:00
Jeffrey Ventrella
d92471860d cleanup 2013-05-31 16:58:58 -07:00
Jeffrey Ventrella
4f49f1769e separated springy balls from skeleton 2013-05-31 16:54:56 -07:00
Stephen Birarda
2d7c397138 create a FreeVerb object for each other agent per agent 2013-05-31 15:47:57 -07:00
Philip Rosedale
69ec109585 Refactor/Cleanup serial interface to use vectors, correct rotation axes. Added translation estimation for the head. 2013-05-31 15:28:15 -07:00
Jeffrey Ventrella
1061b3eb4d cleanup 2013-05-31 15:05:05 -07:00
Jeffrey Ventrella
303643e921 cleanup 2013-05-31 15:01:08 -07:00
Jeffrey Ventrella
e33c11bb48 Merge remote-tracking branch 'upstream/master' 2013-05-31 14:52:46 -07:00
Andrzej Kapolka
929797516d Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 2013-05-31 14:52:39 -07:00
Andrzej Kapolka
e4bc7af6b4 Working on avatar voxels. 2013-05-31 14:52:29 -07:00
Jeffrey Ventrella
f1fc3fe704 merge 2013-05-31 14:52:24 -07:00
Andrzej Kapolka
8f377349ef Merge pull request #474 from PhilipRosedale/master 
Smooth gravity fields when flying
 2013-05-31 14:52:00 -07:00
Philip Rosedale
088e9d0aef Merge branch 'master' of https://github.com/worklist/hifi 2013-05-31 14:21:38 -07:00
Jeffrey Ventrella
3ce051bff7 merge 2013-05-31 14:11:46 -07:00
Philip Rosedale
2a9a3139b2 Added smooth gravity field so we can fly to planets and land on them, static friction to stop drifting, thrust tweaks. 2013-05-31 14:02:20 -07:00
Jeffrey Ventrella
fdfc639c23 merge 2013-05-31 13:52:22 -07:00
ZappoMan
e5e200345b more work on copy and paste 2013-05-31 11:52:18 -07:00
Jeffrey Ventrella
108ce62d1a committing latest skeleton-separation changes (more to come as Andrzej and I work on it more) 2013-05-31 11:51:03 -07:00
ZappoMan
b0397e8eb9 Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-05-30 21:41:55 -07:00
Andrzej Kapolka
224e5d666d Fix for segmentation fault when the settings file doesn't exist. 2013-05-30 17:12:18 -07:00
ZappoMan
bc5af6e399 Merge pull request #438 from Geenz/19308 
#19308 - Store menu settings in the avatar data file
 2013-05-30 16:51:02 -07:00
Geenz
ed904b58eb Fixed spacing issues per the coding standard. 2013-05-30 19:50:01 -04:00
Geenz
fefa74135c Moved to function overloads instead of unique function names. 2013-05-30 19:47:25 -04:00
Philip Rosedale
38e611eb7f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-30 16:19:11 -07:00
Philip Rosedale
f009177aa7 Added check for lost transmitter 2013-05-30 16:19:07 -07:00
Andrzej Kapolka
9213cfd0c2 Revert to simply adding the Eulers. 2013-05-30 15:48:00 -07:00
Andrzej Kapolka
47bf5a2b77 Have the Head control how orientations are added. 2013-05-30 15:43:07 -07:00
Andrzej Kapolka
780b049f4b I got these backwards. 2013-05-30 15:21:54 -07:00
Andrzej Kapolka
826ef33d4b Reverse angles for mirror mode. 2013-05-30 15:20:20 -07:00
Andrzej Kapolka
3f6cf08b97 Removed remaining Orientation bits (and class itself), enforce limits on 
head yaw/pitch/roll.
 2013-05-30 15:15:12 -07:00
Andrzej Kapolka
e2ec8245b0 Rather than adding Euler angles, compose quaternions for gyros. 2013-05-30 14:56:12 -07:00
Andrzej Kapolka
f447230d26 Use body orientation, not head orientation, for mirror mode. 2013-05-30 14:14:01 -07:00
Geenz
0a3dbcd675 Removed unused readYaw variable. 2013-05-30 17:00:32 -04:00
Geenz
0dda2b88b5 Merge branch 'master' of https://github.com/worklist/hifi into 19308 
Conflicts:
	interface/src/Avatar.cpp - resolved; added avatarRotation setting that's interpreted as a vec3
 2013-05-30 16:58:48 -04:00
Andrzej Kapolka
bcd3833898 Align chat with full camera rotation (not just yaw). 2013-05-30 13:46:53 -07:00
Andrzej Kapolka
28531fcae0 Added --local option to avatar-mixer for testing. Only update velocity, 
acceleration, angular velocity, etc., for local avatar.
 2013-05-30 12:33:05 -07:00
Andrzej Kapolka
342e19aa41 Save/restore the pitch and roll as well as the yaw. 2013-05-30 12:12:30 -07:00
Geenz
78c3891c92 Merge commit '6d57324d0b9fce9d6a030123689bb499ed54c8ad' into 19308 2013-05-30 14:48:40 -04:00
Andrzej Kapolka
100d10dc9e Offset camera fix, cleaner frustum transformation. 2013-05-30 11:08:33 -07:00
Andrzej Kapolka
3330b20232 More reformatting. 2013-05-30 10:33:45 -07:00
Andrzej Kapolka
fff9d1c372 Formatting. 2013-05-30 10:23:19 -07:00
Andrzej Kapolka
b502321b57 Moved gravity influence multiplier into constant, reduced. 2013-05-30 10:00:52 -07:00
Andrzej Kapolka
021dce72be Moved direction vectors to AvatarData, made them align with OpenGL view space 
(to avoid the 180 degree rotations).
 2013-05-30 09:55:34 -07:00
Andrzej Kapolka
9b301eb235 Merge branch 'master' of https://github.com/worklist/hifi into reorient 
Conflicts:
	interface/src/Avatar.cpp
 2013-05-29 19:13:18 -07:00
Andrzej Kapolka
d6855b6430 Massive changes to orientations: use quaternions rather than Orientation 
class.
 2013-05-29 19:05:33 -07:00
Jeffrey Ventrella
d839312cd6 testing avatar touch 2013-05-29 17:28:44 -07:00
Jeffrey Ventrella
88ff0ea7aa merge 2013-05-29 16:54:15 -07:00
Jeffrey Ventrella
4c7d75b39e testing avatar touch 2013-05-29 16:52:48 -07:00
Geenz
f0d7b47c37 Merge branch 'master' of https://github.com/worklist/hifi into 19308 2013-05-29 19:47:54 -04:00
birarda
73168af4d1 Merge pull request #458 from birarda/master 
move the mouth out farther in front of the face
 2013-05-29 16:38:35 -07:00
Stephen Birarda
089dc3669d push the mouth out in front of the face 2013-05-29 16:37:40 -07:00
Jeffrey Ventrella
f7a0e8018a Merge remote-tracking branch 'upstream/master' 2013-05-29 16:15:16 -07:00
Jeffrey Ventrella
63434da23c testing avatar touch 2013-05-29 16:14:55 -07:00
birarda
64d02f5f5f Merge pull request #457 from birarda/master 
make it harder to quit accidentally
 2013-05-29 16:06:40 -07:00
Stephen Birarda
b0a8de818d make quit CMD-Q instead of just Q 2013-05-29 16:05:03 -07:00
Jeffrey Ventrella
5750adf6fd test 2013-05-29 15:53:47 -07:00
Stephen Birarda
02333644dc one line fix in AvatarTouch 2013-05-29 15:31:18 -07:00
Jeffrey Ventrella
72688d86ca Merge remote-tracking branch 'upstream/master' 2013-05-29 15:25:05 -07:00
Jeffrey Ventrella
66c7da6552 simplify avatar proximity check for 1p transition 2013-05-29 15:24:37 -07:00
ZappoMan
46c6f2f9b5 latest copy paste 2013-05-29 15:02:28 -07:00
Geenz
c33d2ee25e Coding standard cleanup based upon ZappoMan's suggestions. 2013-05-29 16:46:47 -04:00
ZappoMan
c70ade0cc1 temporary hack fix to not discarding voxels 2013-05-29 12:14:45 -07:00
ZappoMan
377fb1e936 latest copy and paste 2013-05-29 12:06:58 -07:00
Jeffrey Ventrella
ab1c00dac6 Merge remote-tracking branch 'upstream/master' 2013-05-29 11:51:34 -07:00
Jeffrey Ventrella
e34193f1d7 increased hand motion sensitivity 2013-05-29 11:51:16 -07:00
ZappoMan
408fef0de8 Merge pull request #450 from birarda/master 
make audio echo a menu option instead of forcing it with the mirror mode
 2013-05-29 11:47:38 -07:00
Stephen Birarda
b6a0662c98 inline the shouldEchoAudio 2013-05-29 11:47:02 -07:00
Jeffrey Ventrella
ab3b0c8aa3 alpha 2013-05-29 11:43:42 -07:00
Stephen Birarda
a5a30efec9 CR fixes 2013-05-29 11:42:10 -07:00