Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 18:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13063 commits 25 branches 0 tags 1.1 GiB
Commit graph

183 commits

Author SHA1 Message Date
Andrzej Kapolka
f709ea61b5 Need to initialize this to false. 2014-05-20 17:55:48 -07:00
Andrzej Kapolka
7124b4a196 Mask joints from animation when explicitly set. 2014-05-20 17:10:53 -07:00
Andrzej Kapolka
d3e5e3ccf1 A couple explanatory comments. 2014-05-20 15:41:11 -07:00
Andrzej Kapolka
49a0645677 Animation bits. 2014-05-20 15:23:15 -07:00
Andrzej Kapolka
62e7a31602 More work on animation configuration. 2014-05-19 18:09:33 -07:00
Andrew Meadows
49a7f8c910 formatting some lines that are too long 2014-05-15 12:42:38 -07:00
Andrew Meadows
e98f5c7486 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/renderer/Model.cpp
 2014-05-15 12:33:09 -07:00
Andrew Meadows
4640587445 more correct model bounding capsule 2014-05-15 12:28:55 -07:00
ZappoMan
18de6dddec Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-14 12:21:44 -07:00
Andrew Meadows
aad9d0441e merge upstream/master to andrew/bispinor 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/SkeletonModel.cpp
	libraries/avatars/src/HandData.cpp
	libraries/avatars/src/HandData.h
 2014-05-14 09:38:31 -07:00
Andrew Meadows
d2d9ca8788 optimization: only compute baseTransform once 2014-05-14 09:04:59 -07:00
ZappoMan
02bb816d5a Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-13 09:44:49 -07:00
Andrzej Kapolka
363f545f7c After uploading, refresh the uploaded files so that they are immediately 
redownloaded.
 2014-05-09 17:50:08 -07:00
ZappoMan
106c8bffd8 first cut at animations in models 2014-05-09 16:08:06 -07:00
Philip Rosedale
c6b4b7c250 Merge pull request #2811 from AndrewMeadows/inertia 
prevent avatar from getting trapped in voxel collisions
 2014-05-07 16:54:28 -07:00
Andrew Meadows
9fc1c765d3 overhaul of CollisionInfo 
store Cube info for sphereAACube collisions
 2014-05-07 11:40:00 -07:00
Andrzej Kapolka
d0537e7ead Specular map support. 2014-05-06 17:32:10 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Andrzej Kapolka
f37460e39a Basic attachment rendering. 2014-05-05 15:46:09 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
Andrzej Kapolka
3a4dfb92f6 Let's try using the neck parent rotation, rather than the neck, to fix 
separate heads.
 2014-05-02 19:37:42 -07:00
ZappoMan
8443bb0afc fix a scale to fit bug, and add features to place models with hands 2014-05-02 13:19:33 -07:00
Andrzej Kapolka
3ebe1df6de Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-01 21:00:32 -07:00
Andrzej Kapolka
322e12b9de Allow users to clear the head URL and have no separate head model. 2014-05-01 17:55:16 -07:00
ZappoMan
f7da070d77 more work, cleanup names, remove translation use snap to center 2014-05-01 11:29:17 -07:00
ZappoMan
293963c546 implement snap to center in model 2014-05-01 09:02:41 -07:00
ZappoMan
bb6444f5a9 more hacking got it working 2014-05-01 07:30:56 -07:00
ZappoMan
85484affa9 hacking 2014-04-30 17:55:54 -07:00
Andrew Meadows
34aaf98b53 cleanup around how boundary shape is computed 2014-04-29 15:16:50 -07:00
Andrzej Kapolka
2bac802407 One more unused variable. 2014-04-23 12:30:39 -07:00
Andrzej Kapolka
c8c3cf3664 Remove unused propagate option for applyRotationDelta. 2014-04-23 12:29:01 -07:00
Andrzej Kapolka
09bb51261a Got that backwards. 2014-04-23 11:55:16 -07:00
Andrzej Kapolka
523498ee5b Revert to using weight that doesn't depend on number of free joints. 2014-04-23 11:52:22 -07:00
Andrzej Kapolka
511fc8367f More work on IK. 2014-04-23 11:34:34 -07:00
Andrzej Kapolka
f7bc1ae62c Working on integrating rotation into IK. 2014-04-23 10:47:24 -07:00
Andrzej Kapolka
c471a55f1f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 09:40:51 -07:00
Andrzej Kapolka
e2558bdac0 Experimenting with tweaking the Euler angles so that z, rather than y, is in 
[-pi/2, pi/2].
 2014-04-18 17:16:20 -07:00
Stephen Birarda
0a7ea17d43 fix a geometry race condition crash 2014-04-18 15:10:15 -07:00
Andrzej Kapolka
743034c986 Need to transfer parent rotation to child. 2014-04-18 15:09:37 -07:00
Andrzej Kapolka
6add0dfb42 Tweaked Hydra "IK" to propagate delta rotations up the hierarchy while 
preserving joint constraints.
 2014-04-18 15:04:42 -07:00
Andrew Meadows
26487aad06 more correct bounding shapes for Models 2014-04-18 11:19:21 -07:00
Andrew Meadows
cfdbdad2d8 improved method for disabling bad joint shapes 2014-04-17 16:22:35 -07:00
Andrew Meadows
3072161a30 improved collision shapes of models 2014-04-17 15:18:46 -07:00
Andrzej Kapolka
a12dd916fa More plane intersection bits. 2014-04-10 11:24:45 -07:00
Andrzej Kapolka
f61c746b4a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 09:45:23 -07:00
Andrzej Kapolka
9f58264cb6 Working on plane collisions, pushing back camera from intersecting avatars. 2014-04-09 18:07:56 -07:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Andrew Meadows
e480064e66 rename more shapeShape() to be collideShapes() 2014-04-09 13:07:54 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Andrzej Kapolka
15e9d45dc3 Switched from storing Euler angles to using quaternions along with a 
quaternion editor.  Also, use a default step of 0.01 for floats/doubles.
 2014-04-07 15:41:42 -07:00