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

1764 commits

Author SHA1 Message Date
ZappoMan
e5e200345b more work on copy and paste 2013-05-31 11:52:18 -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
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
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
Stephen Birarda
02333644dc one line fix in AvatarTouch 2013-05-29 15:31:18 -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
Jeffrey Ventrella
350bd878fc fix 2013-05-29 11:39:53 -07:00
Stephen Birarda
5d74a865e8 make audio echo a menu option instead of forcing with mirror 2013-05-29 11:35:32 -07:00
Jeffrey Ventrella
39805db040 Merge remote-tracking branch 'upstream/master' 2013-05-29 11:27:36 -07:00
Jeffrey Ventrella
39499e4a92 fix to head transparency 2013-05-29 11:26:06 -07:00
Philip Rosedale
c31c14c56e Merge remote-tracking branch 'upstream/master' into one-liner 2013-05-29 10:46:55 -07:00
Philip Rosedale
ca8c78162d one line fix for translucent head 2013-05-29 10:46:10 -07:00