aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-093-3884/+3919
|\ \ | |/
| * minor: code tidy and inserted log lines for future use.Justin Clark-Casey (justincc)2011-07-092-22/+35
| | | | | | | | | | | | | | | | Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory When phantom is toggled, the sculptdata is regenerated before remeshing. But on resize, the sculptdata is not regenerated. So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
| * refactor: Factor out AddSubMesh() method from long ↵Justin Clark-Casey (justincc)2011-07-081-5/+5
| | | | | | | | | | | | CraeteMeshFromPrimMesher() method Also remove some of the logging spam left in from the last commit.
| * minor: code tidy up - remove a couple of Console.WriteLine() accidentally ↵Justin Clark-Casey (justincc)2011-07-082-53/+23
| | | | | | | | added in the last commit
| * refactor: Separate the OdeScene class into its own file from OdePlugin.cs, ↵Justin Clark-Casey (justincc)2011-07-082-3825/+3873
| | | | | | | | to improve code readability
| * minor: commented out log lines for future use and very small code tidyJustin Clark-Casey (justincc)2011-07-082-4/+8
| |
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-051-1/+4
|\ \ | |/
| * Allow physics proxy generation for meshes using new asset format.dahlia2011-06-291-1/+4
| | | | | | | | Fix an invalid cast exception while decoding new mesh asset format.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-171-0/+3
|\ \ | |/
| * force mesh proxy for simple box prims with path cutdahlia2011-04-121-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-251-0/+5
|\ \ | |/
| * This fixes mantis #5198 and related. Physics is not my expertise, so I'm not ↵Diva Canto2010-12-241-0/+5
| | | | | | | | 100% sure of what all the consequences of this change are. Pushing up, so others can take a look.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-231-0/+19
|\ \ | |/
| * * Re-Adding Scene TimeDilation to Object Update Packets.Teravus Ovares (Dan Olivares)2010-12-231-0/+19
| | | | | | | | | | | | * Added Calculating Time Dilation in the OdePlubin * When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise. * Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-061-4/+4
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-041-4/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-021-2/+2
|\ \ | |/
| * Replace CalculateMass with a more accurate version, contributed by Ubit.Melanie2010-10-021-234/+219
| | | | | | | | Thank you.
| * Typo fixesMelanie2010-09-261-1/+1
| |
| * adding configurable j2kDecodeCache pathBlueWall2010-09-261-1/+5
| | | | | | | | | | | | | | | | allowing the decoded sculpt map cache path to be defined in the configuration files. Use DecodedSculpMapPath in the [Startup] section to set the path. The default is still ./bin/j2kDecodeCache
* | Replace CalculateMass with a more accurate version, contributed by Ubit.Melanie2010-10-021-234/+219
| | | | | | | | Thank you.
* | Typo fixesMelanie2010-09-261-1/+1
| |
* | Merge MasterMelanie2010-09-261-1/+5
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-251-42/+45
|\ \ | |/
| * Add prim name to OdePrim Error and Warning messages.Justin Clark-Casey (justincc)2010-09-251-42/+45
| | | | | | | | This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-272-14/+14
|\ \ | |/
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-06-252-14/+14
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-191-0/+1
|\ \ | |/
| * Hunting for the problem in #4777Diva Canto2010-06-191-0/+1
| |
| * Reverting my last two commits, putting back Melanie's exception handler. ↵Diva Canto2010-06-191-1/+10
| | | | | | | | Doesn't solve #4777.
| * Reinstated the behavior of AddPrimShape *exactly* as it was as of December. ↵Diva Canto2010-06-191-10/+1
| | | | | | | | Trying to fix mantis #4777
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-181-1/+1
|\ \ | |/
| * Remove an error in meshing error reporting. Now doesn't double-bombMelanie2010-06-181-1/+1
| | | | | | | | anymore on a bad sculpt
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-1/+12
|\ \ | |/
| * Log and eat sculpt meshing exceptions caused by bad jp2 data.Melanie2010-06-121-1/+12
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-151-2/+2
|\ \ | |/
| * * Added a better check to the SimianGrid connectors to test if they are ↵John Hurliman2010-03-121-2/+2
| | | | | | | | | | | | enabled or not. This method should work equally well with standalone or robust mode * Applying #4602 from Misterblu to add collision detection to BulletDotNET
* | Resolved mergeKitto Flora2010-03-123-78/+391
|\ \
| * \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-063-65/+398
| |\ \ |/ / / | | _
| * Formatting cleanup.Jeff Ames2010-02-151-25/+25
| |
| * Revolution is on the roll again! :)Revolution2010-02-143-39/+372
| | | | | | | | | | | | | | | | Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events). Direct flames and kudos to Revolution, please Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2010-02-081-0/+2
|\ \ | |/
| * Applying patch #4534 by Misterblue to fix ODE physics stickinessJohn Hurliman2010-02-041-0/+2
| |
* | Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add ↵Kitto Flora2010-01-212-0/+20
| | | | | | | | associated methods.
* | Merge branch 'master' into careminsterMelanie2010-01-034-515/+509
|\ \ | |/
| * Formatting cleanup. Add copyright headers.Jeff Ames2010-01-044-515/+509
| |
* | Fix conflictsKitto Flora2009-12-222-2/+1
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-222-8/+9
| |\ \ | | |/
| | * Glue code for a couple of new LSL function implementationsMelanie2009-12-222-0/+18
| | |
* | | Include ChOdePluginKitto Flora2009-12-223-118/+31
|/ /