Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 19:14:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3351 commits 71 branches 56 tags 1.2 GiB
Commit graph

3351 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
78fe89172a eyedropper mode, and import work 2013-06-03 12:23:16 -07:00
ZappoMan
7dd217b318 more work on copy and paste 2013-06-03 10:57:18 -07:00
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
bd56cde802 Merge pull request #472 from ey6es/master 
Fix for segmentation fault in readSettingsFile.
 2013-05-30 17:13:35 -07:00
Andrzej Kapolka
224e5d666d Fix for segmentation fault when the settings file doesn't exist. 2013-05-30 17:12:18 -07:00
Andrzej Kapolka
430b571c06 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-30 16:51:31 -07:00
Andrzej Kapolka
cb1e1cc3dd Not going down that path. 2013-05-30 16:51:08 -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
ZappoMan
4583f38352 Merge pull request #471 from PhilipRosedale/master 
Detect and stop moving on transmitter signal lost
 2013-05-30 16:46:58 -07:00
Andrzej Kapolka
ffb3cf53aa Added "Gyro Eye Offset" menu option to drive the eye offset from the gyros. 2013-05-30 16:34:59 -07:00
Andrzej Kapolka
6f552b4a00 Playing around with using the gyro acceleration to drive the eye offset. 2013-05-30 16:26:15 -07: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
97343edfca Merge pull request #470 from ey6es/master 
Removed Orientation class, removed duplicate code in avatar-mixer.
 2013-05-30 15:53:20 -07:00
Andrzej Kapolka
86ae9dbe7c Merged. 2013-05-30 15:51:31 -07:00
Andrzej Kapolka
3745cd7196 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-30 15:50:28 -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
Philip Rosedale
82463260e4 Merge pull request #445 from ZappoMan/local_option 
add --local option to avatar-mixer
 2013-05-30 14:51:18 -07:00
Andrzej Kapolka
5967fbcae8 Merge pull request #469 from ey6es/master 
Fixes for chat orientation, mirror mode.
 2013-05-30 14:26:21 -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
27f4674c10 Merge pull request #468 from ey6es/master 
Fixes for reorientation: load/save pitch/roll, don't update orientation for remote avatars.
 2013-05-30 12:38:04 -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
Philip Rosedale
6712c40073 Merge pull request #466 from ey6es/reorient 
Avatar orientation conversion: use quaternions rather than Orientation class, generalize rotations so that avatars can be reoriented based on gravity.
 2013-05-30 11:55:19 -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
birarda
6d57324d0b Merge pull request #465 from birarda/master 
stop continous killing of audio injectors
 2013-05-29 18:37:43 -07:00
Stephen Birarda
1f4e9f3051 update last heard from time for audio injectors 2013-05-29 18:37:03 -07:00
birarda
b4e4e80321 Merge pull request #463 from birarda/master 
distance attenuation tuning
 2013-05-29 17:47:23 -07:00
Stephen Birarda
8ba23bc027 tune distance attenuation 2013-05-29 17:46:54 -07:00