Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-05-08 | 3 | -21/+54 |
|\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | ||||
| * | Bulletsim: and the rotational friction. | Vegaslon | 2013-05-07 | 1 | -3/+5 |
| | | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| * | BulletSim: Another way to create vehicle framed friction. | Vegaslon | 2013-05-07 | 1 | -3/+5 |
| | | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| * | BulletSim: normalize quaternian rotations when building compound linksets. | Robert Adams | 2013-05-06 | 1 | -7/+7 |
| | | | | | | | | Attempt to fix vehicles being twisted off the ground when they go physical. | ||||
| * | BulletSim: properly free references to simple convex hull shapes. Didn't | Robert Adams | 2013-05-06 | 1 | -8/+37 |
| | | | | | | | | loose memory since shapes are shared but did mess up usage accounting. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-05-07 | 1 | -6/+6 |
|\ \ | |/ | |||||
| * | BulletSim: apply linear and angular friction in vehicle coordinates | Robert Adams | 2013-05-06 | 1 | -6/+6 |
| | | | | | | | | and not world coordinates. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-05-06 | 11 | -268/+169 |
|\ \ | |/ | |||||
| * | BulletSim: remove friction calcuation from BSMotor and move linear and | Robert Adams | 2013-05-06 | 7 | -67/+47 |
| | | | | | | | | | | | | | | angular friction computation into linear and angular movement code. The friction wasn't being applied properly. This will make it so vehicles don't drift as much and the drift is tunable by changing the friction timescales. | ||||
| * | BulletSim: simplify parameter specification by reducing the number of | Robert Adams | 2013-05-06 | 2 | -191/+94 |
| | | | | | | | | specifications required for simple properties with defaults. | ||||
| * | BulletSim: extend BSActorLockAxis to allow locking linear movement in | Robert Adams | 2013-05-06 | 3 | -10/+28 |
| | | | | | | | | addition to angular movement. Not enabled by anything yet. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-05-04 | 30 | -1638/+1353 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| * | BulletSim: zero vehicle motion when changing vehicle type. | Robert Adams | 2013-05-03 | 6 | -26/+18 |
| | | | | | | | | | | Rebuild compound linkset of any child in the linkset changes shape. Comments and better detailed logging messages. | ||||
| * | BulletSim: prims with no cuts created with single convex hull shape. | Robert Adams | 2013-05-02 | 4 | -2/+99 |
| | | | | | | | | Parameter added to enable/disable this feature. | ||||
| * | BulletSim: Rebuild physical body if physical shape changes for mesh and hull. | Robert Adams | 2013-05-02 | 4 | -24/+73 |
| | | | | | | | | | | Properly rebuilds collision caches. Release asset data fetched when building mesh or hulls. | ||||
| * | BulletSim: fix crash when mesh asset wasn't available when meshing | Robert Adams | 2013-05-01 | 2 | -10/+19 |
| | | | | | | | | | | the first time. Debugging added for mesh/hull asset fetch. | ||||
| * | BulletSim: rework LinksetCompound to work with new BSShape system. | Robert Adams | 2013-05-01 | 1 | -106/+40 |
| | | | | | | | | Not all working yet. | ||||
| * | Merge branch 'master' into bulletsim4 | Robert Adams | 2013-05-01 | 1 | -0/+3 |
| |\ | |||||
| * | | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all ↵ | Robert Adams | 2013-04-30 | 5 | -17/+50 |
| | | | | | | | | | | | | working yet. | ||||
| * | | BulletSim: Add non-static BSShape.GetReference for getting another reference | Robert Adams | 2013-04-29 | 2 | -32/+102 |
| | | | | | | | | | | | | | | | | | | | | | to an existing shape instance. BSShapeNative rebuilds shape for all references. BSShapeCompound returns another reference copy if the compound shape already exists (for linksets). | ||||
| * | | BulletSim: LinksetCompound work to disable collision for root and | Robert Adams | 2013-04-29 | 1 | -14/+30 |
| | | | | | | | | | | | | | | | | | | | | | child prims so compound shape can do all collisions. Don't try to build a compound linkset for non-physical linksets. Remove and replace root body when compound shape is added so collision cache is rebuilt. | ||||
| * | | BulletSim: remove trailing white space to make git happier. No functional ↵ | Robert Adams | 2013-04-29 | 20 | -152/+152 |
| | | | | | | | | | | | | changes. | ||||
| * | | BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or ↵ | Robert Adams | 2013-04-29 | 11 | -282/+282 |
| | | | | | | | | | | | | 'm_physicsScene' to match coding conventions and reduce confusion. | ||||
| * | | BulletSim: first cut at new linksetCompound shape building. | Robert Adams | 2013-04-29 | 1 | -63/+27 |
| | | | |||||
| * | | BulletSim: fix crash when creating new hull. | Robert Adams | 2013-04-29 | 1 | -13/+14 |
| | | | |||||
| * | | BulletSim: code for creating the avatar capsule shape. | Robert Adams | 2013-04-29 | 1 | -0/+13 |
| | | | |||||
| * | | BulletSim: massive refactor of shape classes. Removed shape specific code ↵ | Robert Adams | 2013-04-29 | 20 | -1050/+290 |
| | | | | | | | | | | | | from BSShapeCollection. Using BSShape* classes to hold references to shape. Simplified shape dependency callbacks. Remove 'PreferredShape' methods and have each class specify shape type. Disable compound shape linkset for a later commit that will simplify linkset implementation. | ||||
| * | | BulletSim: complete BSShape classes. | Robert Adams | 2013-04-29 | 3 | -19/+316 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-04-30 | 1 | -0/+3 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | BulletSim: fix error messages created while an avatar has no initial | Robert Adams | 2013-04-30 | 1 | -0/+3 |
| |/ | | | | | | | | | collisions. Usually happens when logging in an avatar that had been previously flying. Uninitialized variable. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-04-25 | 10 | -82/+360 |
|\ \ | |/ | |||||
| * | BulletSim: partial addition of BSShape class code preparing for | Robert Adams | 2013-04-24 | 2 | -52/+191 |
| | | | | | | | | | | different physical mesh representations (simplified convex meshes) and avatar mesh. | ||||
| * | BulletSim: update DLLs and SOs to they have no dependencies on newer | Robert Adams | 2013-04-24 | 3 | -0/+44 |
| | | | | | | | | | | glibc (2.14) since that is not yet in some Linux distributions. Add unmanaged API calls and code for creating single convex hull shapes. | ||||
| * | BulletSim: improve avatar stair walking up. Add more parameters to control force | Robert Adams | 2013-04-23 | 5 | -25/+123 |
| | | | | | | | | | | of both position change and up force that move avatars over barrier. Default parameters are for steps up to 0.5m in height. | ||||
| * | BulletSim: fix crash when deleting llVolumeDetect enabled objects. Bullet's ↵ | Robert Adams | 2013-04-22 | 1 | -5/+2 |
| | | | | | | | | check for an object being linked into the world does not work for Bullet's ghost objects so BulletSim was deleting the object while it was still linked into the physical world structures. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-04-10 | 17 | -815/+1403 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| * | BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. | Robert Adams | 2013-04-09 | 3 | -6/+18 |
| | | |||||
| * | BulletSim: some formatting changes. | Robert Adams | 2013-04-09 | 1 | -10/+17 |
| | | |||||
| * | Another algorithm for AngularVerticalAttraction. This one Takes into account ↵ | Vegaslon | 2013-04-09 | 1 | -0/+23 |
| | | | | | | | | | | | | all rotations before it and makes the corrections more close to the time that sl does. Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| * | BulletSim: add Bullet HACD library invocation. Turned off by default as not | Robert Adams | 2013-04-09 | 3 | -94/+183 |
| | | | | | | | | totally debugged. Updated DLLs and SOs with more debugged HACD library code. | ||||
| * | BulletSim: fix problem where large sets of mega-regions weren't registering | Robert Adams | 2013-04-09 | 1 | -3/+3 |
| | | | | | | | | all the terrain with the base region. | ||||
| * | BulletSim: moving comments around. No functional change. | Robert Adams | 2013-04-08 | 3 | -10/+11 |
| | | |||||
| * | BulletSim: clean up actor code so routines use the same coding pattern. | Robert Adams | 2013-04-08 | 10 | -123/+137 |
| | | | | | | | | Fix a few enabling problems. | ||||
| * | BulletSim: complete movement of physical object action code out of the | Robert Adams | 2013-04-08 | 11 | -636/+1078 |
| | | | | | | | | | | physical object and into actors for setForce, setTorque, hover, lock axis and avatar move. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-04-02 | 14 | -214/+529 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| * | BulletSim: create axis lock constraint with proper orientation and | Robert Adams | 2013-04-02 | 1 | -4/+2 |
| | | | | | | | | enable axis lock functionality. | ||||
| * | BulletSim: update unmanaged API for HACD parameter passing. Bullet HACD | Robert Adams | 2013-04-01 | 3 | -6/+20 |
| | | | | | | | | | | mesh to hull conversion calls in place but code not working. Update BulletSim DLLs and SOs for new API and HACD code. | ||||
| * | BulletSim: rearrange mega-region terrain code to make the thread flow | Robert Adams | 2013-04-01 | 1 | -15/+18 |
| | | | | | | | | a little clearer. | ||||
| * | BulletSim: stop an avatar from moving if standing on a stationary | Robert Adams | 2013-03-31 | 1 | -1/+8 |
| | | | | | | | | | | | | object. This will stop avatars from sliding down steep terrains or objects while still allowing an avatar to be moved if standing on a moving object. | ||||
| * | BulletSim: not quite functional axis lock code. | Robert Adams | 2013-03-31 | 5 | -35/+43 |
| | |