Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 10:36:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4499 commits 71 branches 56 tags 1.2 GiB
Commit graph

446 commits

Author SHA1 Message Date
Andrzej Kapolka
52c616b688 Added configurable lean scale, fixed loadSetting. 2013-06-12 13:06:28 -07:00
Philip Rosedale
6164e6cd7e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-12 11:37:24 -07:00
Andrzej Kapolka
59c8d9d26a Function cleanup, fixed misspelling, tweaked transparency distances to 
accomodate lean.
 2013-06-12 10:25:28 -07:00
Philip Rosedale
750d210f0a Merge branch 'master' of https://github.com/worklist/hifi 2013-06-11 21:20:39 -07:00
Philip Rosedale
ad58d0aa23 Adding voxel thrust on grabbing/dragging to move avatar 2013-06-11 21:19:58 -07:00
Andrzej Kapolka
7ef2a2c5d9 Set/get lean to/from network data. 2013-06-11 18:06:05 -07:00
Andrzej Kapolka
82f03ffd8e Don't render the voxels when we're too close (i.e., in first person mode). 2013-06-11 17:53:49 -07:00
Andrzej Kapolka
648aacb53d Let's use a fixed vector for the camera position so that the target doesn't 
move with lean.
 2013-06-11 17:26:41 -07:00
Andrzej Kapolka
70c5a941d7 Now let's try using the estimated position to calculate lean. 2013-06-11 17:01:06 -07:00
Andrzej Kapolka
c1c2439d2c Let's try changing the torso rotation based on the gyros! 2013-06-11 16:44:21 -07:00
Andrzej Kapolka
35e18abcbd Let's try using estimated velocity to control "lean." 2013-06-11 16:27:39 -07:00
Philip Rosedale
57fcaceec2 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-11 11:10:41 -07:00
Philip Rosedale
b1e3a0984b Improved mouse look behavior to be smoother, removed transmitter debug. 2013-06-11 11:10:09 -07:00
ZappoMan
fc3fb7d3f0 fixed bug with loading of corrupt settings file where NaN returned for avatar position details 2013-06-10 11:46:06 -07:00
Andrzej Kapolka
dc8a6c2725 Store the avatar voxel URL along with the rest of the avatar settings. 2013-06-07 11:30:41 -07:00
Philip Rosedale
f0c9bd45bb Fixed merge 2013-06-07 09:19:49 -07:00
Philip Rosedale
b5e63fb446 Added debug->run timing tests option to speed test some common functions (please add some more, bottom of util.cpp 2013-06-06 17:52:19 -07:00
Stephen Birarda
bd553ef061 repair indentation and NULL comparisons in Avatar class 2013-06-06 16:01:36 -07:00
Andrzej Kapolka
650981abfa Remove the bounce term; it causes fluctuations in velocity. 2013-06-06 13:41:22 -07:00
Andrzej Kapolka
56b4c04a18 Adjusted head base/top transforms. 2013-06-06 11:09:09 -07:00
Andrzej Kapolka
d9d6891cc8 Use the head rotation to adjust the position, too. 2013-06-06 10:54:28 -07:00
Andrzej Kapolka
27717bfcd4 Removed unused variables. 2013-06-06 10:48:35 -07:00
Andrzej Kapolka
2cc640b6f6 Set head bone rotation from head orientation. 2013-06-06 10:26:26 -07:00
Andrzej Kapolka
e0189c9834 Build fix, render body as balls if we don't have an avatar. 2013-06-06 10:17:57 -07:00
Andrzej Kapolka
80847b3884 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-06 10:10:07 -07:00
Andrzej Kapolka
7af42a1896 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Avatar.cpp
 2013-06-06 10:09:48 -07:00
Andrzej Kapolka
4cac35293a Refer to body balls parents, not joint parents. 2013-06-06 10:08:15 -07:00
Philip Rosedale
b08fe8f915 merge fixes 2013-06-06 10:07:50 -07:00
Philip Rosedale
61d4ac2675 Fixes per code review. 2013-06-06 09:52:39 -07:00
Stephen Birarda
dd7c1fab2e more spacing fixes in Avatar.cpp 2013-06-06 09:51:32 -07:00
Stephen Birarda
6a7434651a spacing fix in Avatar.cpp 2013-06-06 09:42:25 -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
Stephen Birarda
2cb9b609f4 resolve conflicts on merge with upstream master 2013-06-05 18:28:02 -07:00
Stephen Birarda
30d6c7f68a Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-05 18:26:12 -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
Stephen Birarda
e5a1fa4dec Merge branch 'master' of github.com:worklist/hifi into synthesis 2013-06-05 17:03: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
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
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
ZappoMan
b75bd80de7 fix build busters 2013-06-04 17:54:48 -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
atlante45
d539ea283e Merge 19358 with upstream Master 2013-06-05 01:43:47 +02:00
Andrzej Kapolka
b856af505a Adjusted default bind radius, spring vector threshold. 2013-06-04 15:52:39 -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
atlante45
c199190666 Fixes asked by ZappoMan on QSettings' commit. 2013-06-04 19:00:38 +02:00
Jeffrey Ventrella
cee2244364 fixed formatting things 2013-06-03 17:55:48 -07:00
Jeffrey Ventrella
da09dd3259 test 2013-06-03 17:16:52 -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
Andrzej Kapolka
73f8fca2af More work on voxeltars; added rotations. 2013-06-03 13:00:54 -07:00
Jeffrey Ventrella
6479a41206 more ball prep 2013-06-03 12:26:20 -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
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
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
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
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
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
e2ec8245b0 Rather than adding Euler angles, compose quaternions for gyros. 2013-05-30 14:56:12 -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
Andrzej Kapolka
fff9d1c372 Formatting. 2013-05-30 10:23:19 -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