aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * BulletSim: add parameters and API calls for setting ERP and CFM.Robert Adams2012-07-316-29/+164
| | | | | | | | | | | | Set ERP and CFM in linkset constraints. Reorder rebuilding of object bodies so they are not rebuilt everytime something is linked and unlinked.
* | Merge branch 'avination' into careminsterMelanie2012-07-291-2/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Change the stair fudge factor so steps of 0.5m can be climbled to match ↵Melanie2012-07-271-2/+2
| | | | | | | | | | | | inworldz claims and SL's realities
* | | Merge branch 'master' into careminsterMelanie2012-07-287-488/+1171
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * | Remove the LandGeom checks in OdeScene - these are pointless since LandGeom ↵Justin Clark-Casey (justincc)2012-07-271-4/+2
| | | | | | | | | | | | | | | | | | | | | is always IntPtr.Zero and contacts returned always have a valid geometry. Possibly this was for a feature that was never implemented or was otherwise removed. Thanks to SignpostMarv for the spot of the warning that shows this parameter was never changed.
| * | BulletSim: fix a recursive loop when fetching the mass of the root of a linkset.Robert Adams2012-07-262-4/+4
| | |
| * | BulletSim: refactor all the linkset logic out of the prim classRobert Adams2012-07-264-235/+409
| | | | | | | | | | | | | | | | | | and into its own class. The BulletSim data structures track individual prims as linksets of 1 so most of the prim code is not different between a linked and unlinked object.
| * | Add check so Ode does not try to simulate after it has been Dispose()'ed. ↵Robert Adams2012-07-261-0/+9
| | | | | | | | | | | | Fixes exception that happens when shutting down region (improvements from last patch)
| * | BulletSim: remove unused, commented out code in BSConstraintRobert Adams2012-07-251-8/+0
| | |
| * | BulletSim: fix line endings in newly added files (Is it DOS or is it UNIX? ↵Robert Adams2012-07-252-301/+301
| | | | | | | | | | | | Only it's hairdresser knows for sure)
| * | BulletSim: add parameters for setting linkset constraint factorsRobert Adams2012-07-252-17/+32
| | |
| * | BulletSim: small change to use the pointer to the bullet object for zeroing ↵Robert Adams2012-07-251-6/+5
| | | | | | | | | | | | forces.
| * | BulletSim: Redo parameter specification so only one place hasRobert Adams2012-07-251-248/+378
| | | | | | | | | | | | | | | to change to have a parameter show up in the ini file and command line. Will make it much easier for the next person.
| * | BulletSim: Add C# classes for storing and tracking constraints.Robert Adams2012-07-252-0/+301
| | |
| * | BulletSim: Move constraint tracking from C++ code to C# codeRobert Adams2012-07-252-18/+83
| | | | | | | | | | | | for more flexibility.
* | | Merge branch 'master' into careminsterMelanie2012-07-253-96/+265
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | BulletSim: change how prim mass is saved so it is always calculated but zero ↵Robert Adams2012-07-231-20/+23
| | | | | | | | | | | | is given if not physical.
| * | BulletSim: small optimizations for link and unlink codeRobert Adams2012-07-231-12/+8
| | |
| * | BulletSim: add Dispose() code to free up resources and close log files.Robert Adams2012-07-231-0/+21
| | |
| * | BulletSim: add all the new functions to BulletSimAPI.Robert Adams2012-07-232-6/+139
| | | | | | | | | | | | Modify ZeroMotion() to not make tainting calls and to use new API calls.
| * | BulletSim: improve linking to add each link individually rather than ↵Robert Adams2012-07-231-60/+76
| | | | | | | | | | | | rebuilding the object each time. Makes it an O(n) operation rather than O(n\!).
* | | Merge branch 'master' into careminsterMelanie2012-07-235-242/+533
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| * BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs ↵Robert Adams2012-07-201-1/+2
| | | | | | | | attempting to fix a mono compile error.
| * BulletSim: more detail logging for vehicle and general physics debugging.Robert Adams2012-07-204-75/+244
| | | | | | | | | | | | | | | | Physical linksets are fully functional. Tweeking of the vehicle code to make it semi-work. Utilize the new API2 for some setting operations. Add GetOrientation() API call for proper reporting of children of linksets. Changes the interface between C# and C++ code so old DLLs won't work!
| * BulletSim: fix compile errors from last commit. Clean up passing of physics ↵Robert Adams2012-07-202-15/+14
| | | | | | | | scene into vehicle dynamics code.
| * BulletSim: Add very detailed logging to BSDynamics for vehicle debuggingRobert Adams2012-07-203-45/+146
| |
| * BulletSim: Add PID variables to physical scene. Not PIDing yet, but soon.Robert Adams2012-07-203-101/+97
| | | | | | | | Cleaned up code and got rid of compile warnings.
| * BulletSim: Add detailed and voluminous debug logging that is enabledRobert Adams2012-07-202-40/+65
| | | | | | | | | | | | | | with an ini configuration parameter. Correct computation of relative offsets of children in a linkset. Remove a prim from any link relationship before deleting it. Minor code flow cleanups.
* | Update ubitMesh primMesher with new Dahlia version on core ( reckick gitUbitUmarov2012-07-191-143/+183
| | | | | | | | back)
* | Merge branch 'avination' into ubitworkUbitUmarov2012-07-1712-570/+1267
|\ \
| * \ Merge branch 'avination' into careminsterMelanie2012-07-166-136/+84
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ Merge branch 'master' into careminsterMelanie2012-07-161-143/+183
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | update PrimMesher.cs to dll version r72 which fixes some path errors in ↵dahlia2012-07-131-143/+183
| | | | | | | | | | | | | | | | sliced linear prims. Addresses Mantis #6085
| * | | Merge branch 'avination' into careminsterMelanie2012-07-115-62/+140
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-07-114-58/+107
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * | | Clean up collision reporting code so they are properly passed toRobert Adams2012-07-064-58/+107
| | | | | | | | | | | | | | | | | | | | | | | | | the simulator in batches. More comments.
| * | | | Merge branch 'avination' into careminsterMelanie2012-07-061-11/+38
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-011-2/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-301-2/+3
| | | | | |
| * | | | | Merge branch 'master' into careminsterMelanie2012-06-292-16/+16
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * | | | Move update of the final optional ODE total frame stat inside the OdeLock ↵Justin Clark-Casey (justincc)2012-06-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | rather than outside to avoid a very occasional race condition with the stat collection thread
| | * | | | refactor: rename _collisionEventPrim to m_collisionEventActors and ↵Justin Clark-Casey (justincc)2012-06-291-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _collisionEventPrimChanges to m_collisionEventActorsChanges to reflect their actual contents. These dictionaries handle all actor types, not just physical prims.
| | * | | | Fix a regression where we stopped removing avatars from collision event ↵Justin Clark-Casey (justincc)2012-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reporting on logout, rather than stopping clearing their collision events. This occurred in b18c8c8 (Thu May 17 2012). This was a cause of very occasional race conditions and likely memory leakage as clients came and went from the region.
| * | | | | Merge branch 'avination' into careminsterMelanie2012-06-061-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-06-021-60/+256
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| | * | | | | Add optional total avatars, total prims and active prims stats to ODE plugin.Justin Clark-Casey (justincc)2012-06-011-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will act as a sanity check with the main scene stats, to show that physics scene entities are being managed properly. Total prims will not match scene total prims since physics total does not include phantom prims
| | * | | | | If OdeScene.Near() returns no collision contacts, then exit as early as ↵Justin Clark-Casey (justincc)2012-06-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | possible. All subsequent code is only relevant if there are contacts.
| | * | | | | Add optional stat for the other collision time per frame not spent in ODE ↵Justin Clark-Casey (justincc)2012-06-011-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | native spaces or geom collision code
| | * | | | | Add avatar forces calculation, prim force and raycasting per frame ↵Justin Clark-Casey (justincc)2012-06-011-7/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | millisecond optional stats
| | * | | | | Collection optional avatar and prim taint frame millisecond timesJustin Clark-Casey (justincc)2012-06-011-7/+36
| | | | | | |
generated by cgit v1.1 at 2025-01-18 11:17:26 +0000