aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-08-072-2/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * BulletSim: add implementation of 'physSetLinksetType' and 'physGetLinksetType'Robert Adams2013-08-022-2/+4
| | | | | | | | | | and processing routines in BulletSim. Add linkset rebuild/conversion routine in BSLinkset.
* | Merge branch 'master' into careminsterMelanie2013-07-242-0/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Revert "Revert "Add experimental stubs for an extension function interface ↵Robert Adams2013-07-232-0/+15
| | | | | | | | | | | | | | | | on both"" Found that the vehicle movement problem was not caused by these physics changes. This reverts commit 89857378ce79f93a265bc1eb151e17742032abfa.
| * Revert "Add experimental stubs for an extension function interface on both"Robert Adams2013-07-222-15/+0
| | | | | | | | | | | | The changes don't seem to be ready for prime time. This reverts commit 13a4a80b3893af13ab748c177b731fed813974ca.
| * Add experimental stubs for an extension function interface on bothRobert Adams2013-07-222-0/+15
| | | | | | | | PhysicsScene and PhysicsActor.
* | Merge branch 'master' into careminsterMelanie2013-02-081-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-072-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."Melanie2013-02-071-5/+0
| | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a.
| * Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-071-0/+5
| | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart.
* | Merge branch 'master' into careminsterMelanie2013-02-071-3/+3
|\ \ | |/ | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| * Change passed PhysicsParameter value from float to the more general string valueRobert Adams2013-02-071-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2013-02-061-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-051-0/+1
| | | | | | | | | | | | | | | | | | invisible barriers in sculptie doorways (Mantis 6529). Bump up level-of-detail for physical meshes to 32 (the max). This fixes the invisible barriers that showed up in prim cut arches. NOTE: the default LOD values are removed from OpenSimDefaults.ini. If you don't change your OpenSimDefaults.ini, you will continue to see the arch problem.
* | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ | |/ | | | | | | | | | | | | 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.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | 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 careminsterMelanie2013-02-041-2/+2
|\ \ | |/
| * Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantomJustin Clark-Casey (justincc)2013-02-021-2/+2
| |
| * Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-231-0/+39
| |
* | Merge branch 'avination' into careminsterMelanie2013-01-241-1/+1
|\ \
| * | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-231-1/+1
| | | | | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
* | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-161-2/+9
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | BulletSim: add osGetPhysicsEngineType() LSL function and updateRobert Adams2013-01-111-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | the physics engines to return the name that is specified in the INI file ("physics = XXX") as the type of engine. This os function is a little different than the others in that it does not throw an exception of one is not privilaged to use it. It merely returns an empty string.
* | | Merge branch 'avination' into careminsterMelanie2013-01-061-3/+20
|\ \ \ | | |/ | |/|
| * | *TEST* avatar unscripted sit. Some guessing/automationUbitUmarov2013-01-021-2/+19
| | |
| * | fixUbitUmarov2012-12-181-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-021-1/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate.Robert Adams2012-12-311-1/+1
| | | | | | | | | | | | Update BulletSim DLLs and SOs with simplier step function interface.
* | | Merge branch 'avination' into careminsterMelanie2012-12-182-2/+32
|\ \ \ | | |/ | |/|
| * | *TESTP unscripted sit: missing filesUbitUmarov2012-12-172-0/+6
| | |
| * | fix let other phys plugins work.. broken when added feetOffsetUbitUmarov2012-12-111-8/+2
| | |
| * | missing fileUbitUmarov2012-12-111-0/+9
| | |
| * | create a new ode character also with the new informationUbitUmarov2012-12-071-2/+16
| | |
| * | *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-071-0/+5
| | |
| * | avatar collision plane send to viewer is only relative to feet. changeUbitUmarov2012-12-051-0/+2
| | | | | | | | | | | | avatar collider, just rounding the boxes, etc
* | | Merge branch 'master' into careminsterMelanie2012-12-161-5/+8
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * | Return the last set targetVelocity rather than the current velocity as the ↵Robert Adams2012-12-131-5/+8
| | | | | | | | | | | | default action made available in PhysicsActor.TargetVelocity. Doesn't change any physics operation but makes DSG work better as the targetVelocity value does not keep moving around.
* | | Merge branch 'master' into careminsterMelanie2012-11-302-3/+8
|\ \ \ | |/ / | | / | |/ |/| Conflicts: OpenSim/Region/Physics/Manager/IMesher.cs
| * BulletSim: add expanded call to IMesher/Meshmerizer which enables/disables ↵Robert Adams2012-11-292-1/+7
| | | | | | | | mesh caching. Since BulletSim caches and tracks the unmanaged memory version of meshes, the Meshmerizer itself does not need to cache built meshes once BulletSim has made the physical proxy mesh.
* | Merge branch 'master' into careminsterMelanie2012-11-151-2/+2
|\ \ | |/
| * Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-141-1/+1
| |
| * Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵Diva Canto2012-11-131-1/+1
| | | | | | | | have an AssemblyInfo file.
* | Merge branch 'master' into careminsterMelanie2012-11-011-0/+6
|\ \ | |/
| * Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵Dan Lake2012-10-311-0/+6
| | | | | | | | No change to existing functions.
| * missing changed fileUbitUmarov2012-10-181-1/+1
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | add mesh cache expire on region startup. Expires will be relative toUbitUmarov2012-10-132-0/+2
| | | | | | | | | | | | previus expire (assumed done only once at startup). File 'cntr' on cache folder stores time. Deleting it will force a skip on expire. Default time is 48hours before previus startup to account for failed ones etc.
* | retouch mesh idsUbitUmarov2012-10-131-1/+1
| |
* | longer meshs identification keys, so first part on disk cache is it's asset idUbitUmarov2012-10-131-1/+3
| |
generated by cgit v1.1 at 2024-09-12 18:30:54 +0000