| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 1 | -0/+1 |
|\ |
|
| * | Adding commented out log messages and some minor formatting for future bug hu... | Justin Clark-Casey (justincc) | 2012-01-02 | 1 | -0/+1 |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2011-12-24 | 1 | -2/+2 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster | Melanie | 2011-12-23 | 1 | -2/+2 |
| |\ \
| | |/ |
|
| | * | Align default ODE_STEPSIZE with that already used through OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2011-12-22 | 1 | -2/+2 |
* | | | Add setter for Acceleration on physics objects. | Melanie | 2011-12-24 | 2 | -0/+2 |
|/ / |
|
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 10 | -34/+13 |
|\ \
| |/ |
|
| * | Remove unused SetAcceleration and add set on Acceleration parameter | Dan Lake | 2011-12-20 | 10 | -34/+13 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-20 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-20 | 1 | -1/+1 |
| |\ |
|
| * | | Fixed bug of avie going under the terrain when crossing regions in certain di... | Diva Canto | 2011-12-20 | 1 | -2/+2 |
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 4 | -27/+52 |
|\ \ \
| | |/
| |/| |
|
| * | | Comment out accidentally left in "Adding physics prim" log message | Justin Clark-Casey (justincc) | 2011-12-16 | 1 | -1/+1 |
| |/ |
|
| * | Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter con... | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -5/+0 |
| * | Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() whe... | Justin Clark-Casey (justincc) | 2011-12-15 | 3 | -18/+25 |
| * | Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter | Justin Clark-Casey (justincc) | 2011-12-15 | 2 | -8/+24 |
| * | minor: add some currently commented log lines for use in debugging | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -1/+8 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-14 | 1 | -58/+20 |
|\ \
| |/ |
|
| * | Simplify some manipulation of _taintedActors in OdeScene | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -13/+6 |
| * | Eliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour ... | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -45/+14 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-14 | 1 | -2/+1 |
|\ \
| |/ |
|
| * | minor: remove pointless comment from OdeScene.cs | Justin Clark-Casey (justincc) | 2011-12-12 | 1 | -2/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-01 | 1 | -9/+6 |
|\ \
| |/ |
|
| * | minor: remove mono compile warning, a Vector3 can never be null since it's a ... | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -9/+6 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 3 | -8/+8 |
|\ \
| |/ |
|
| * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-11-25 | 3 | -8/+8 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 5 | -539/+525 |
|\ \
| |/ |
|
| * | Log error if we attempt to add/remove an OdeCharacter from the _characters li... | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -23/+33 |
| * | Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since th... | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -6/+1 |
| * | Comment out uncalled OdeScene.UnCombine() | Justin Clark-Casey (justincc) | 2011-11-22 | 2 | -66/+60 |
| * | slightly simplify OdeScene.Simulate() by removing bool processtaints, since w... | Justin Clark-Casey (justincc) | 2011-11-22 | 3 | -141/+128 |
| * | Slightly improve "Unable to space collide" logging message, though I don't th... | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -1/+2 |
| * | Get rid of OdeCharacter != null checks since OdeScene._characters can never c... | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -17/+4 |
| * | remove unnecessary OdeScene._activeprims locking. Code is single-threaded | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -53/+46 |
| * | Restore defects list. In hindsight, the reason for this is becuase we can't ... | Justin Clark-Casey (justincc) | 2011-11-21 | 2 | -92/+112 |
| * | simplify operation of OdeScene._perloopContact | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -45/+51 |
| * | don't bother locking OdeScene._perloopContact in single threaded code | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -47/+42 |
| * | don't lock OdeScene.contacts since only ever accessed by a single thread | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -10/+24 |
| * | rename ODECharacter.AvatarGeomAndBodyCreation() -> CreateOdeStructures() to m... | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -8/+10 |
| * | refactor: Eliminate one line ODECharacter.doForce() method for code clarity | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -15/+3 |
| * | Comment out calls to OdeScene.waitForSpaceUnlock() since that method does not... | Justin Clark-Casey (justincc) | 2011-11-21 | 3 | -23/+24 |
| * | Reduce complexity of OdeScene.Simulate() by fully removing bad characters at ... | Justin Clark-Casey (justincc) | 2011-11-21 | 2 | -70/+29 |
| * | move geom/actor map maintenance into DestroyODEStructures()/AvatarGeomAndBody... | Justin Clark-Casey (justincc) | 2011-11-21 | 2 | -10/+9 |
| * | When changing avatar size in ODE, remove the old actor from the name and acto... | Justin Clark-Casey (justincc) | 2011-11-21 | 2 | -8/+14 |
| * | When an ODECharacter is removed (e.g. when an avatar leaves a scene), remove ... | Justin Clark-Casey (justincc) | 2011-11-21 | 2 | -10/+23 |
| * | Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaini... | Justin Clark-Casey (justincc) | 2011-11-21 | 3 | -9/+14 |
| * | Actually remove PhysicsActor.SOPDescription this time | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -1/+3 |
| * | Instead of generating a new list for bad characters on every physics pass, ke... | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -3/+12 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 6 | -65/+68 |
|\ \
| |/ |
|
| * | Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ow... | Justin Clark-Casey (justincc) | 2011-11-16 | 6 | -41/+29 |