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

3367 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeffrey Ventrella
9e046b74e6 working on avatar touch 2013-06-03 08:09:27 -07:00
Jeffrey Ventrella
1786c9f9e1 Merge pull request #475 from Ventrella/master 
this pull request is mostly about the skeleton code
 2013-05-31 17:35:10 -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
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
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
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
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
Andrzej Kapolka
f5e7d6e3fe Merge pull request #473 from ey6es/master 
Fix for compile error that Clement encountered.
 2013-05-31 10:44:40 -07:00
Andrzej Kapolka
98759c3ba1 Include <unistd.h> to address a build error experienced by Clement. 2013-05-31 10:27:25 -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