| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-08-07 | 1 | -1/+2 |
| |\ | | | | | | | | | | | | | 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 Adams | 2013-08-02 | 1 | -1/+2 |
| | | | | | | | | | | | and processing routines in BulletSim. Add linkset rebuild/conversion routine in BSLinkset. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-07-24 | 1 | -0/+9 |
| |\ \ | |/ | | | | | | | | | | | | | | | | | | | 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 Adams | 2013-07-23 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | 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 Adams | 2013-07-22 | 1 | -9/+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 both | Robert Adams | 2013-07-22 | 1 | -0/+9 |
| | | | | | | | | | PhysicsScene and PhysicsActor. | ||||
| | * | Add some more code from Avination. This changes physics actor stuff around | Melanie | 2013-02-07 | 1 | -0/+6 |
| | | | | | | | | | to work with the new params. Not actually plumbed just yet. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-04 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom | Justin Clark-Casey (justincc) | 2013-02-02 | 1 | -2/+2 |
| | | | |||||
| | * | Add the Avination physics raycast glue so Core Physics can implement raycast | Melanie | 2013-01-23 | 1 | -0/+39 |
| | | | |||||
| * | | 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 commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster | Melanie | 2013-01-16 | 1 | -2/+9 |
| |\ \ \ | |/ / |/| / | |/ | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | BulletSim: add osGetPhysicsEngineType() LSL function and update | Robert Adams | 2013-01-11 | 1 | -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. | ||||
| | * | missing changed file | UbitUmarov | 2012-10-18 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | *TEST* avatar unscripted sit. Some guessing/automation | UbitUmarov | 2013-01-02 | 1 | -2/+19 |
| | | | |||||
| * | | fix | UbitUmarov | 2012-12-18 | 1 | -1/+1 |
| | | | |||||
| * | | *TESTP unscripted sit: missing files | UbitUmarov | 2012-12-17 | 1 | -0/+5 |
| | | | |||||
| * | | fix let other phys plugins work.. broken when added feetOffset | UbitUmarov | 2012-12-11 | 1 | -8/+2 |
| | | | |||||
| * | | create a new ode character also with the new information | UbitUmarov | 2012-12-07 | 1 | -2/+16 |
| | | | |||||
| * | | move terrain geom to own ode space. Limit range on raycast if includes | UbitUmarov | 2012-10-09 | 1 | -0/+3 |
| | | | | | | | | | | | | | terrain until ode doesn't eat all stack. Add a pre-simulation method to do pending actors changes (except mesh assets still not ready to use), to be optionaly called before firing heartbeat. [UNTESTED] | ||||
| * | | missing changed file | UbitUmarov | 2012-10-03 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 1 | -0/+5 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs | ||||
| | * | Create the ability for physics modules to request assets on demand by | Melanie | 2012-08-01 | 1 | -0/+5 |
| | | | | | | | | | | | | | themselves. For that, the physics module simply calls RequestAssetMethod, which in turn points to Scene.PhysicsRequestAsset. This gives physics access to the asset system without introducing unwanted knowledge of the scene class. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-05-31 | 1 | -0/+14 |
| |\ \ | |/ | |||||
| | * | Add an optional mechanism for physics modules to collect and return ↵ | Justin Clark-Casey (justincc) | 2012-05-31 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | arbitrary stats. If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule (http://opensimulator.org/wiki/Monitoring_Module) This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings]. This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing. This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds. The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code. | ||||
| * | | ubitODE + physmanager: - Revised use of ODE collisions categories and ↵ | UbitUmarov | 2012-04-16 | 1 | -0/+40 |
| | | | | | | | | | bits(flags) for better use as filters together with top spaces (for example physical prims are on topactivespace and not physical are on topstaticspace) - Added new world raycast with filters. This blocks calling thread with a timeout of 500ms waiting for heartbeat ode thread signal job done. - Don't let ode bodies being disabled for 2 long except for vehicles. This is necessary to detect when the object is at rest at top of other and that is removed. Assume that vehicles can be enabled by used action. | ||||
| * | | Tell physics about physics shape when creating. Added some virtual methods ↵ | UbitUmarov | 2012-03-21 | 1 | -0/+7 |
| | | | | | | | | | to get/set density,gravmod, frition,bounce and shape type ( not in use ). UbitOde now should do convex type on creation or everytime the mesh is changed ( as in change size, shape, etc ) | ||||
| * | | initial steps to support physical phantoms | UbitUmarov | 2012-03-11 | 1 | -3/+6 |
| | | | |||||
| * | | Added simple binary serializer/deserializer to chODE. 100% untested and most ↵ | UbitUmarov | 2012-02-17 | 1 | -0/+6 |
| | | | | | | | | | like still broken | ||||
| * | | changes in physics manager, needed for UbitODE | UbitUmarov | 2012-02-08 | 1 | -1/+9 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 1 | -8/+2 |
| |\ \ | |/ | |||||
| | * | Comment out uncalled OdeScene.UnCombine() | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -8/+2 |
| | | | |||||
| * | | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+5 |
| |\ \ | |/ | |||||
| | * | Store scene identifier passed in to OdeScene for later debug messages | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -0/+5 |
| | | | |||||
| * | | Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+0 |
| |\ \ | |/ | |||||
| | * | refactor: make methods that do not need to be public in ODE private or ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+0 |
| | | | | | | | | | internal to aid code reading/analysis. Remove some unused method arguments | ||||
| * | | Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmerge | Melanie | 2011-10-25 | 1 | -88/+4 |
| |\ \ | |/ | |||||
| | * | Extract NullPhysicsScene from PhysicsScene to improve code readability | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -88/+4 |
| | | | |||||
| * | | Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+22 |
| |\ \ | |/ | |||||
| | * | refactor: move 3x copy/pasted ode structure removal code in ODECharacter ↵ | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -1/+22 |
| | | | | | | | | | | | | | into a DestroyOdeStructures() method also adds some method doc | ||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -12/+27 |
| |\ \ | |/ | |||||
| | * | refactor: centralize prim geom removal code from four places to one | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -0/+4 |
| | | | |||||
| | * | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts | Dan Lake | 2011-07-20 | 1 | -14/+0 |
| | | | |||||
| | * | Fix some local id issues in physics glue | root | 2011-07-15 | 1 | -12/+7 |
| | | | |||||
| | * | Port implementation of llCastRay() from Aurora. | Justin Clark-Casey (justincc) | 2011-07-12 | 1 | -1/+23 |
| | | | | | | | | | I haven't been able to test this since the viewer won't parse the llCastRay() function. Maybe some activation cap is missing. Could wait until it is activated by default in the viewer. | ||||
| * | | Fox some local id issues in physics glue | Melanie | 2011-07-15 | 1 | -12/+7 |
| | | | |||||
| * | | Revert "Add localid support to ch0de properly" | Melanie | 2011-07-15 | 1 | -7/+12 |
| | | | | | | | | | This reverts commit bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d. | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |