| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster | Melanie | 2013-03-19 | 2 | -16/+22 |
| |\ | |||||
| | * | BulletSim: add INI parameter for angular banking timescale fudge parameter. | Robert Adams | 2013-03-16 | 2 | -7/+12 |
| | | | |||||
| | * | BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL ↵ | Vegaslon | 2013-03-16 | 1 | -16/+17 |
| | | | | | | | | | | | | | Grade, Other features when implemented should slow it down for now be Strong with Vertical Angular attraction setting and conservative with Angular Velocity on X axis) Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-15 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | BulletSim: Tweak vertical angular attraction to remove double ↵ | Vegaslon | 2013-03-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | VehicleOrientation application fixing the problem with the vertical attractor pushing vehicles nose first into ground when tilted on side. Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| * | | 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 |
| | | | | |||||
| | * | | Rename "Bounce" to "Restitution" in PhysicsActor as well. It appears these | Melanie | 2013-02-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | values are not even used. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-03-11 | 4 | -23/+117 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | BulletSim: remove the ability for avatars to fly off the edge of | Robert Adams | 2013-03-09 | 4 | -23/+117 |
| | | | | | | | | | | | | | | | | regions when there are no region neighbors. Add some terrain location processing routines to support above. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-03-08 | 1 | -2/+7 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | * | | Add regression test for presence crossing between regions on the same simulator. | Justin Clark-Casey (justincc) | 2013-03-06 | 1 | -2/+7 |
| | | | | | | | | | | | | | Unlike a much earlier commented out version of this test, this is done in synchronous mode. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-03-01 | 4 | -15/+63 |
| |\ \ \ | |/ / | |||||
| | * | | BulletSim: more things into the TODO list. | Robert Adams | 2013-03-01 | 1 | -1/+6 |
| | | | | |||||
| | * | | BulletSim: add parameters, code cleanup around checking and enforcing | Robert Adams | 2013-03-01 | 3 | -14/+57 |
| | | | | | | | | | | | | | maximum velocity and angular velocity values for prims. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 2 | -8/+12 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | * | | BulletSim: fix crash around race condition when a mesh asset cannot | Robert Adams | 2013-02-26 | 2 | -8/+12 |
| | | | | | | | | | | | | | | | | be fetched. Update TODO list. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-26 | 1 | -4/+6 |
| |\ \ \ | |/ / | |||||
| | * | | BulletSim: tweeks to make avatar jump work better. | Robert Adams | 2013-02-25 | 1 | -4/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 17 | -494/+826 |
| |\ \ \ | |/ / | |||||
| | * | | BulletSim: add OutOfBounds logic and some position sanity checking | Robert Adams | 2013-02-21 | 5 | -33/+68 |
| | | | | | | | | | | | | | to eliminate some of the "cannot find terrain height" warning messages. | ||||
| | * | | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 3 | -3/+3 |
| | | | | |||||
| | * | | BulletSim: experimental lock axis code using constraints. Not enabled | Robert Adams | 2013-02-17 | 2 | -22/+74 |
| | | | | | | | | | | | | | by default. Like more debugging is needed. | ||||
| | * | | BulletSim: add calls for creating all the different Bullet constraint types. | Robert Adams | 2013-02-17 | 5 | -47/+338 |
| | | | | | | | | | | | | | | | | Updated the DLLs and SOs and code for BulletXNA to create the types. All the detailed control calls are not all in place yet. | ||||
| | * | | BulletSim: rework parameter setting for different types of values | Robert Adams | 2013-02-17 | 5 | -394/+348 |
| | | | | | | | | | | | | | (like vectors or quaternions). | ||||
| | * | | BulletSim: fix physical object appearing to slowly float off when | Robert Adams | 2013-02-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | they stop moving. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-13 | 9 | -141/+304 |
| |\ \ \ | |/ / | |||||
| | * | | BulletSim: fix density since the simulator/viewer track density in a | Robert Adams | 2013-02-12 | 7 | -25/+150 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | funny unit that is 100 times real density (default 1000). Fix avatar drifting slowly when stationary flying. Fix for physical prims getting corrected for being under terrain when it was just its geometric center that was below terrain. Add PreUpdatePropertyAction allowing plugable modifiction of phys parameters returned from Bullet. Fix an exception setting GravityMultiplier on initialization. Update DLLs and SOs for good measure (no functional change). | ||||
| | * | | BulletSim: More work on center-of-mass. Remove linksetinfo and rely on ↵ | Robert Adams | 2013-02-12 | 8 | -124/+162 |
| | | | | | | | | | | | | | simulator to update info. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-10 | 12 | -255/+446 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations | ||||
| | * | | BulletSim: add parameter to set global contact breaking threshold. Update ↵ | Robert Adams | 2013-02-08 | 2 | -0/+7 |
| | | | | | | | | | | | | | DLLs and SOs for setting same. | ||||
| | * | | BulletSim: Change BSCharacter to use new base Density and Friction | Robert Adams | 2013-02-08 | 2 | -16/+12 |
| | | | | | | | | | | | | | variables rather than own local varaibles. | ||||
| | * | | BulletSim: fix avatar bobbing or jiggling while stationary flying. | Robert Adams | 2013-02-08 | 5 | -18/+25 |
| | | | | | | | | | | | | | Various comments and debugging message mods. | ||||
| | * | | BulletSim: include the linkage to the layered prim implementation. Separate ↵ | Robert Adams | 2013-02-08 | 8 | -225/+109 |
| | | | | | | | | | | | | | layers for physical (vs simulator) location displacement and linksets. | ||||
| | * | | BulletSim: reclass BSPrim into layers so linkset and physical world ↵ | Robert Adams | 2013-02-08 | 2 | -0/+297 |
| | | | | | | | | | | | | | displacement is implemented as overlay classes rather than if statements scattered about. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 4 | -36/+106 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | ||||
| | * | | BulletSim: Adapt BulletSim to the newer physical properties. Viewer | Robert Adams | 2013-02-07 | 2 | -30/+28 |
| | | | | | | | | | | | | | dialog setting of friction, restitution, ... working. | ||||
| | * | | BulletSim: fix exceptions caused by setting physical properties before the ↵ | Robert Adams | 2013-02-07 | 1 | -5/+10 |
| | | | | | | | | | | | | | prim body is initialized. | ||||
| | * | | BulletSim: add user setting of friction, density and restitution. | Robert Adams | 2013-02-07 | 3 | -27/+94 |
| | | | | |||||
| | * | | Add some more code from Avination. This changes physics actor stuff around | Melanie | 2013-02-07 | 2 | -3/+13 |
| | | | | | | | | | | | | | to work with the new params. Not actually plumbed just yet. | ||||
| | * | | Revert "Add plumbing for physics properties to get to the physics engine." | Melanie | 2013-02-07 | 1 | -5/+0 |
| | | | | | | | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a. | ||||
| | * | | Add plumbing for physics properties to get to the physics engine. | Robert Adams | 2013-02-07 | 1 | -0/+5 |
| | | | | | | | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 3 | -29/+52 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll | ||||
| | * | | Change passed PhysicsParameter value from float to the more general string value | Robert Adams | 2013-02-07 | 3 | -29/+52 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 3 | -12/+25 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| | * | | BulletSim: set removing zero width triangles in meshes to be enabled by ↵ | Robert Adams | 2013-02-06 | 2 | -1/+2 |
| | | | | | | | | | | | | | default. This should fix the invisible barrier in sculptie doorways bug. | ||||
| | * | | BulletSim: check for completely degenerate meshes (ones with all | Robert Adams | 2013-02-06 | 1 | -9/+19 |
| | | | | | | | | | | | | | | | | triangles having zero width) and output an error rather than throwing and exception. | ||||
| | * | | BulletSim: remove an exception which occurs if a physics mesh | Robert Adams | 2013-02-06 | 1 | -2/+4 |
| | | | | | | | | | | | | | asset is not found. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 12 | -182/+230 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| | * | | BulletSim: make removing zero width triangles from meshes optional | Robert Adams | 2013-02-05 | 2 | -24/+33 |
| | | | | | | | | | | | | | and, for the moment, default to 'off'. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |