Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | Add localid support to ch0de properly | Tom | 2011-07-15 | 1 | -12/+7 |
|/ | |||||
* | minor: commented out log lines for future use and very small code tidy | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -1/+4 |
| | |||||
* | Add localID to physical object creation functions. | Mic Bowman | 2011-06-15 | 1 | -0/+15 |
| | |||||
* | * Adds Normal to the fields returned by the Physics Raycaster | Teravus Ovares (Dan Olivares) | 2009-12-05 | 1 | -2/+2 |
| | | | | | | | | * Fixes recognizing when a sit target is and isn't set. * * 1. Vector3.Zero. * * 2. Orientation: x:0, y:0, z:0, w:1 - ZERO_ROTATION * * (or) Orientation: x:0, y:0, z:0, w:0 - Invalid Quaternion * * (or) Orientation: x:0, y:0, z:1, w:0 - Invalid mapping, some older objects still exist with it | ||||
* | Move the calculation of time dilation from the scene to the physics engine. ↵ | John Hurliman | 2009-10-27 | 1 | -0/+5 |
| | | | | The scene is still the one reporting dilation so this does not break the API or remove flexibility, but it gets the calculation happening in the right place for the normal OpenSim usage. The actual calculation of physics time dilation probably needs tweaking | ||||
* | Experimental change of PhysicsVector to Vector3. Untested | John Hurliman | 2009-10-26 | 1 | -16/+16 |
| | |||||
* | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -2/+2 |
| | |||||
* | * One last attempt to get the bordercrossing/primcrossing/attachmentcrossing ↵ | Teravus Ovares (Dan Olivares) | 2009-09-02 | 1 | -0/+5 |
| | | | | | | right in the new border framework. * This also contains some inactive preliminary code for disconnecting combined regions that will be used to make one root region a virtual region of a new root region. | ||||
* | * Some Physics Scene Changes to prepare for larger regions | Teravus Ovares (Dan Olivares) | 2009-08-18 | 1 | -1/+1 |
| | |||||
* | * part one of adding physics combining | Teravus Ovares (Dan Olivares) | 2009-08-15 | 1 | -0/+10 |
| | |||||
* | Formatting cleanup. | Jeff Ames | 2009-07-23 | 1 | -1/+1 |
| | |||||
* | * Created a way that the OpenSimulator scene can ask the physics scene to do ↵ | Teravus Ovares | 2009-07-19 | 1 | -0/+36 |
| | | | | | | | | | a raycast test safely. * Test for prim obstructions between the avatar and camera. If there are obstructions, inform the client to move the camera closer. This makes it so that walls and objects don't obstruct your view while you're moving around. Try walking inside a hollowed tori. You'll see how much easier it is now because your camera automatically moves closer so you can still see. * Created a way to know if the user's camera is alt + cammed or just following the avatar. * Changes IClientAPI interface by adding SendCameraConstraint(Vector4 CameraConstraint) | ||||
* | Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵ | Jeff Ames | 2009-06-01 | 1 | -1/+1 |
| | | | | LICENSE.txt. | ||||
* | This started as way to correct Mantis #3158, which I believe should be fixed ↵ | diva | 2009-02-15 | 1 | -2/+2 |
| | | | | now. The flying status was temporarily being ignored, which caused the avie to drop sometimes -- there was a race condition. In the process it also fixes that annoying bug in basic physics where the avie would drop half-way to the ground upon region crossings (SetAppearance was missing). Additionally, a lot of child-agent-related code has been cleaned up; namely child agents are now consistently not added to physical scenes, and they also don't have appearances. All of that happens in MakeRoot, consistently. | ||||
* | Reverts patch from tuco/mikkopa/sempuki mantis #3072 | Teravus Ovares | 2009-02-08 | 1 | -6/+0 |
| | |||||
* | Change access levels from private to protected to facilitate | Mike Mazur | 2009-02-03 | 1 | -0/+6 |
| | | | | | | subclassing; also add new method signatures. Thanks tuco and mikkopa. Fix Mantis #3072. | ||||
* | * Applying Nlin's NINJA Joint patch. v2. Mantis# 2874 | Teravus Ovares | 2008-12-26 | 1 | -0/+64 |
| | | | | | | | | | | * Thanks nlin! * To try it out, set ninja joints active in the ODEPhysicsSettings and use the example at: * http://forge.opensimulator.org/gf/download/frsrelease/142/304/demo-playground.tgz. * Don't forget to change the .tgz to .oar and load it with load-oar. | ||||
* | * refactor: as per a recent opensim-dev thread, rename InnerScene to ↵ | Justin Clarke Casey | 2008-11-12 | 1 | -1/+1 |
| | | | | SceneGraph to make it more descriptive of its intended function | ||||
* | * This is the fabled LibOMV update with all of the libOMV types from JHurliman | Teravus Ovares | 2008-09-06 | 1 | -1/+1 |
| | | | | | | | * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke. | ||||
* | * Adds Top Colliders when using ODE. Access it from the estate tools/debug tab. | Teravus Ovares | 2008-05-25 | 1 | -0/+9 |
| | |||||
* | * Refactored IConfigSource into Physics plug-ins and Scene. We can get rid ↵ | Teravus Ovares | 2008-05-14 | 1 | -2/+3 |
| | | | | | | | of some of the parameters we pass to it's constructor now like, 'm_allowPhysicalPrim', 'seeIntoOtherRegions', etc.. so on * The main purpose of this is to provide configuration options for ODE and other physics plug-ins that are advanced enough to be able to be configured. | ||||
* | * Optimised using statements and namespace references across entire project ↵ | Adam Frisby | 2008-04-21 | 1 | -3/+3 |
| | | | | (this took a while to run). | ||||
* | Formatting cleanup. | Jeff Ames | 2008-03-18 | 1 | -28/+28 |
| | |||||
* | * Added ODEPlugin Support for llSetBuoyancy. Set Buoyancy to 1 for space prim. | Teravus Ovares | 2008-03-10 | 1 | -0/+6 |
| | | | | | * Added WaterLevel support to the ODEPlugin. More on this later. | ||||
* | ODE: Tired of floating above the ground after crossing a border? Boy have I ↵ | Teravus Ovares | 2008-02-18 | 1 | -2/+2 |
| | | | | got a solution for you! For a limited time, you can be the right height after border crossings automatically. Just three easy payments of $9.95 and make sure your neighbor is sending child agent updates! | ||||
* | * Added PhysicsScene.Dispose() | Teravus Ovares | 2008-02-11 | 1 | -0/+6 |
| | | | | | * In ODE, disposing of all of the ODE objects and the ODE World to reclaim memory when the simulator restarts. | ||||
* | Clean up logging calls using String.Format explicitly | Jeff Ames | 2008-02-10 | 1 | -4/+4 |
| | |||||
* | Converted logging to use log4net. | Jeff Ames | 2008-02-05 | 1 | -7/+9 |
| | | | | | | Changed LogBase to ConsoleBase, which handles console I/O. This is mostly an in-place conversion, so lots of refactoring can still be done. | ||||
* | * Optimized usings | lbsa71 | 2007-12-27 | 1 | -6/+9 |
| | | | | | | | * shortened references * Removed redundant 'this' * Normalized EOF | ||||
* | * Added some simstats to fill the simulator pane of the Statistics monitor. | Teravus Ovares | 2007-12-12 | 1 | -2/+3 |
| | | | | | * I stress, this is an initial implementation and the Agents(Child and Root) are definately obviously incorrect. | ||||
* | saved OpenSim source code from the giant rampaging unterminated copyright ↵ | Jeff Ames | 2007-12-10 | 1 | -1/+1 |
| | | | | notice of doom |