Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 8 | -10/+10 |
|\ | | | | | | | | | | | | | | | 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 | ||||
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6 | Justin Clark-Casey (justincc) | 2013-02-05 | 7 | -7/+7 |
| | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-02-04 | 8 | -149/+166 |
|\ \ | |/ | |||||
| * | Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom | Justin Clark-Casey (justincc) | 2013-02-02 | 1 | -2/+2 |
| | | |||||
| * | BulletSim: fix problem where editting a physical linkset caused the | Robert Adams | 2013-02-01 | 2 | -19/+33 |
| | | | | | | | | | | child prim physical positions to get out of sync with the view. More reliably compute the offset of children in a physical linkset. | ||||
| * | BulletSim: fix crash caused when linksets were rebuilt. A problem added | Robert Adams | 2013-01-31 | 5 | -80/+106 |
| | | | | | | | | | | when individual child pos/rot changes were implementated a week or so ago. Remove some passing of inTaintTime flag when it was never false. | ||||
| * | BulletSim: make sure vehicle physical properties are set when going | Robert Adams | 2013-01-31 | 5 | -46/+35 |
| | | | | | | | | | | | | physical by delaying setting until pre-step time. Change vehicle.Refresh() to schedule the pre-step setting. Comments and updating of TODO list. | ||||
| * | BulletSim: clean up TargetVelocity implementation by using the default defn ↵ | Robert Adams | 2013-01-31 | 2 | -14/+2 |
| | | | | | | | | in the PhysicsActor base class. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 13 | -98/+557 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| * | BulletSim: fix physics repositioning when under ground to only happen | Robert Adams | 2013-01-29 | 3 | -15/+50 |
| | | | | | | | | for physical objects. Non-physical objects can go anywhere they want. | ||||
| * | BulletSim: enable angular vertical attraction. | Robert Adams | 2013-01-28 | 2 | -3/+3 |
| | | | | | | | | | | Increase terrain collision margin to help vehicles from tunneling into same. | ||||
| * | BulletSim: first unit test: vehicle angular attraction | Robert Adams | 2013-01-28 | 5 | -79/+150 |
| | | |||||
| * | BulletSim: do not zero an avatar's standing velocity if it is standing | Robert Adams | 2013-01-28 | 3 | -96/+118 |
| | | | | | | | | | | | | | | on a moving object. Rearrange pre/post action subscription code to put more in locks. Add meshmerizer params to BulletSimTestUtil scene creation (and fix line endings). Rebuilt version of DLLs and SOs with cleaned up code and no profiling for sure. | ||||
| * | BulletSim: rename 'uint' to 'UInt32' to make clear the type that is passed ↵ | Robert Adams | 2013-01-28 | 1 | -14/+14 |
| | | | | | | | | to unmanaged code. | ||||
| * | BulletSim: fix the trimming of colliders so only the top 25 are returned. | Robert Adams | 2013-01-28 | 2 | -4/+4 |
| | | |||||
| * | BulletSim: simplify the initialization of some of the parameters. | Robert Adams | 2013-01-27 | 2 | -32/+23 |
| | | | | | | | | | | | | Disable vertical attraction for vehicles by default (for the moment). Fix bug where vehicle would go crazy when velocity got above a certain speed. | ||||
| * | BulletSim: reinstate the supression of rotational velocity for vehicles | Robert Adams | 2013-01-27 | 1 | -1/+1 |
| | | |||||
| * | BulletSim: add framework for BulletSim unit tests. No tests yet. | Robert Adams | 2013-01-27 | 3 | -0/+193 |
| | | |||||
| * | BulletSim: disable center-of-mass computation because it does not work yet | Robert Adams | 2013-01-27 | 1 | -1/+1 |
| | | |||||
| * | BulletSim: fix compile error from last commit | Robert Adams | 2013-01-27 | 1 | -2/+2 |
| | | |||||
| * | BulletSim: parameterize the value for gravity reduction for ground vehicles ↵ | Robert Adams | 2013-01-27 | 3 | -11/+18 |
| | | | | | | | | on the ground. Set defaults for vehicle factors to one. Debug logging changes. | ||||
| * | BulletSim: first attempt at reporting top colliders | Robert Adams | 2013-01-27 | 5 | -11/+43 |
| | | |||||
| * | BulletSim: parameterize several vehicle debugging values: physical linear ↵ | Robert Adams | 2013-01-27 | 3 | -9/+57 |
| | | | | | | | | and angular force factors now default to less than 1 (0.2) vehicle friction and restitution now default to low values | ||||
| * | BulletSim: finish the post step event for physical object actions. Modify ↵ | Robert Adams | 2013-01-27 | 3 | -13/+73 |
| | | | | | | | | vehicle to use post step event for logging. | ||||
* | | 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 'master' into careminster | Melanie | 2013-01-26 | 2 | -86/+127 |
|\ \ \ | | |/ | |/| | |||||
| * | | * This adds llVolumeDetect functionality to the C# implementation of BulletSim. | teravus | 2013-01-25 | 1 | -86/+116 |
| | | | |||||
| * | | BulletSim: reduce the force of gravity on ground vehicles when they | Robert Adams | 2013-01-24 | 1 | -0/+11 |
| | | | | | | | | | | | | are on the ground. Makes them a little more stable. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-25 | 5 | -175/+356 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | ||||
| * | | BulletSim: reduce the zeroing threshold for rotational velocity. | Robert Adams | 2013-01-24 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | Sometimes settling of a vehicle from gravity introduces small velocities that need to be kept. | ||||
| * | | BulletSim: disable CCD (continuious collision detection) and | Robert Adams | 2013-01-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | contact processing threshold since the first didn't solve tunneling problems but used resources and the latter caused instabilities. | ||||
| * | | BulletSim: zero motion on an object that we pop up because it is | Robert Adams | 2013-01-24 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | below terrain. If the position is being corrected because it is out of bounds, all other movement rules are out the window. | ||||
| * | | BulletSim: remove exception that can happen when setting physics parameters ↵ | Robert Adams | 2013-01-24 | 1 | -2/+2 |
| | | | | | | | | | | | | from the console. | ||||
| * | | * Added in the manifold point dept on collision desc. In BulletSim engine ↵ | teravus | 2013-01-24 | 1 | -5/+64 |
| | | | | | | | | | | | | BulletXNA. | ||||
| * | | * Repairs the Object updates, Collision updates, and Child Prim methods ↵ | teravus | 2013-01-24 | 1 | -164/+282 |
| | | | | | | | | | | | | | | | | | | making the bulletXNA engine work again. * The only thing that had an issue was when creating a new RigidBody, BulletXNA didn't know the type SimMotionState and the upcast type is unknown in the constructor. Therefore, I had to update the IMotionState with a new method 'SetBody'. All of the duplicated type information has been removed and BulletXNA is not relying on any non-standard types external to the library. | ||||
* | | | Merge branch 'avination' into careminster | Melanie | 2013-01-24 | 2 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix a type (Suports => Supports). Also put the normal terrain collision check | Melanie | 2013-01-23 | 2 | -2/+2 |
| | | | | | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon) | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-24 | 2 | -2/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | BulletSim: pass up and report the real collision penetration. | Robert Adams | 2013-01-23 | 2 | -2/+4 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-24 | 9 | -107/+83 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | | BulletSim: remove setting of vehicle InterpolationRotationalVelocity. | Robert Adams | 2013-01-23 | 2 | -36/+34 |
| | | | | | | | | | | | | | | | | | | This doesn't seem to help the vehicle stability. Rename vehicle internal variables adding a "V" or "W" so it is clear when coordinates are vehicle or world relative. | ||||
| * | | BulletSim: small change to center-of-mass computation left out last commit | Robert Adams | 2013-01-23 | 1 | -3/+8 |
| | | | |||||
| * | | BulletSim: center-of-gravity linkset changes. Not working yet. | Robert Adams | 2013-01-23 | 4 | -29/+9 |
| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | ||||
| * | | BulletSim: working on COM | Robert Adams | 2013-01-23 | 4 | -7/+36 |
| | | | |||||
| * | | BulletSim: fix build break introduced by previous commit | Robert Adams | 2013-01-23 | 1 | -5/+0 |
| | | | |||||
| * | | BulletSim: remove the unused RestoreBodyDependencies used by linksets | Robert Adams | 2013-01-23 | 3 | -33/+2 |
| | | | | | | | | | | | | and vehicles and clean up code by removing their kludgyness. | ||||
| * | | Add the Avination physics raycast glue so Core Physics can implement raycast | Melanie | 2013-01-23 | 1 | -0/+39 |
| | | | |||||
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2013-01-23 | 2 | -170/+53 |
|\ \ \ | | | | | | | | | | | | | careminster | ||||
| * \ \ | 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 |