Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'avination' into careminster | Melanie | 2013-03-13 | 1 | -2/+2 |
|\ | |||||
| * | Spot fix the interpenetration issue. Thanks, Ter. | Melanie | 2013-03-12 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
* | | Merge branch 'avination' into careminster | Melanie | 2013-01-27 | 1 | -36/+40 |
|\ \ | |/ | |||||
| * | bug fix: crash when too many collisions on a ode step | UbitUmarov | 2013-01-26 | 1 | -36/+40 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2013-01-24 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix a type (Suports => Supports). Also put the normal terrain collision check | Melanie | 2013-01-23 | 1 | -1/+1 |
| | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon) | ||||
* | | Merge branch 'avination' | Melanie | 2013-01-19 | 2 | -170/+53 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs | ||||
| * | prevent potencial invalid refs | UbitUmarov | 2013-01-13 | 2 | -170/+53 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2013-01-10 | 3 | -25/+43 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | * DAnger, TEST * change camera plane collision detection. Still bounces on | UbitUmarov | 2013-01-08 | 1 | -12/+29 |
| | | | | | | | | * prim edges due to camera lag | ||||
| * | also exclude land | UbitUmarov | 2013-01-07 | 1 | -3/+3 |
| | | |||||
| * | exclude avatars from unfiltered RaycastWorld | UbitUmarov | 2013-01-07 | 1 | -3/+3 |
| | | |||||
| * | don't try to read geom positions outside main ode thread :( | UbitUmarov | 2013-01-06 | 1 | -10/+11 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2013-01-06 | 5 | -356/+833 |
|\ \ | |/ | |||||
| * | bug fix, cleanup... | UbitUmarov | 2013-01-03 | 3 | -38/+34 |
| | | |||||
| * | i try to fix avatar orientation in some cases.. | UbitUmarov | 2013-01-02 | 1 | -2/+2 |
| | | |||||
| * | add a lock to CollisionEventsThisFrame | UbitUmarov | 2013-01-02 | 1 | -20/+29 |
| | | |||||
| * | *TEST* avatar unscripted sit. Some guessing/automation | UbitUmarov | 2013-01-02 | 4 | -328/+782 |
| | | |||||
| * | missing file | UbitUmarov | 2012-12-18 | 1 | -4/+3 |
| | | |||||
| * | fix | UbitUmarov | 2012-12-18 | 2 | -7/+26 |
| | | |||||
| * | some clean up/fix | UbitUmarov | 2012-12-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-12-18 | 5 | -350/+921 |
|\ \ | |/ | |||||
| * | * TEST * unscripted sit | UbitUmarov | 2012-12-17 | 2 | -2/+196 |
| | | |||||
| * | make ubitODE ignore X and Y rotation components on avatar rotations | UbitUmarov | 2012-12-11 | 1 | -14/+37 |
| | | |||||
| * | changes on the fast speed avatars collider, collisions from above, etc | UbitUmarov | 2012-12-11 | 1 | -62/+64 |
| | | |||||
| * | fix let other phys plugins work.. broken when added feetOffset | UbitUmarov | 2012-12-11 | 2 | -5/+6 |
| | | |||||
| * | missing files remove some warnings... | UbitUmarov | 2012-12-11 | 3 | -4/+3 |
| | | |||||
| * | a few more changes on avatar collider | UbitUmarov | 2012-12-11 | 2 | -299/+363 |
| | | |||||
| * | create a new ode character also with the new information | UbitUmarov | 2012-12-07 | 2 | -3/+4 |
| | | |||||
| * | *TEST* Use new avatar size in ubitODE. | UbitUmarov | 2012-12-07 | 2 | -4/+45 |
| | | |||||
| * | avatar collision plane send to viewer is only relative to feet. change | UbitUmarov | 2012-12-05 | 2 | -101/+72 |
| | | | | | | | | avatar collider, just rounding the boxes, etc | ||||
| * | move characters (avatars) to own collision space, also fixing a problem | UbitUmarov | 2012-12-04 | 3 | -14/+47 |
| | | | | | | | | with previus code that was still assuming the avatar is g2 | ||||
| * | raise standing avatar a bit to reduce knees bending on some collisions. | UbitUmarov | 2012-12-04 | 1 | -4/+4 |
| | | | | | | | | reduce head size a bit | ||||
| * | Merge branch 'avination' into ubitwork | Melanie | 2012-12-03 | 2 | -102/+344 |
| |\ | |||||
| | * | *TEST* diferent avatar collider | UbitUmarov | 2012-12-03 | 2 | -101/+337 |
| | | | |||||
| | * | adjust avatar standing Z position | UbitUmarov | 2012-12-03 | 1 | -5/+11 |
| | | | |||||
| * | | don't zero constant force and torque in selection | UbitUmarov | 2012-11-24 | 1 | -6/+6 |
| |/ | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-30 | 1 | -3/+3 |
|/ | | | | | Conflicts: OpenSim/Region/Physics/Manager/IMesher.cs | ||||
* | add debug position on bad primmesh error | UbitUmarov | 2012-11-02 | 1 | -2/+2 |
| | |||||
* | revert last change | UbitUmarov | 2012-10-28 | 1 | -2/+1 |
| | |||||
* | fix ode timing | UbitUmarov | 2012-10-28 | 1 | -1/+2 |
| | |||||
* | minor change | UbitUmarov | 2012-10-28 | 1 | -0/+1 |
| | |||||
* | test limit ode exec time by time not number of loops done | UbitUmarov | 2012-10-28 | 1 | -8/+13 |
| | |||||
* | bug fix | UbitUmarov | 2012-10-20 | 2 | -1/+3 |
| | |||||
* | UbitOde stop doing a copy of the asset data using just the reference to | UbitUmarov | 2012-10-19 | 1 | -2/+3 |
| | | | | it. It costs a lot of cpu and doesn't seem all that usefull. | ||||
* | fixes | UbitUmarov | 2012-10-16 | 3 | -67/+82 |
| | |||||
* | missing file | UbitUmarov | 2012-10-13 | 1 | -0/+2 |
| | |||||
* | [TEST] disk cache meshs | UbitUmarov | 2012-10-12 | 1 | -2/+2 |
| | |||||
* | commit the right files! | UbitUmarov | 2012-10-12 | 2 | -5737/+4763 |
| |