| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -10/+16 |
| |\ |
|
| | * | Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at th... | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -10/+16 |
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-24 | 1 | -0/+2 |
| |\ \
| |/ |
|
| | * | Stop spurious scene loop startup timeout alarms for scenes with many prims. | Justin Clark-Casey (justincc) | 2012-02-24 | 1 | -0/+2 |
| | * | Remove unused SetAcceleration and add set on Acceleration parameter | Dan Lake | 2011-12-20 | 1 | -0/+1 |
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -0/+1 |
| |\ \ |
|
| | * | | Remove unused SetAcceleration and add set on Acceleration parameter | Dan Lake | 2011-12-20 | 1 | -0/+1 |
| | |/ |
|
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 1 | -11/+9 |
| |\ \
| |/ |
|
| | * | slightly simplify OdeScene.Simulate() by removing bool processtaints, since w... | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -1/+0 |
| | * | Comment out calls to OdeScene.waitForSpaceUnlock() since that method does not... | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -9/+9 |
| | * | Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaini... | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -1/+0 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -10/+1 |
| |\ \
| |/ |
|
| | * | Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ow... | Justin Clark-Casey (justincc) | 2011-11-16 | 1 | -10/+1 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 1 | -0/+3 |
| |\ \
| |/ |
|
| | * | Add comment for experimental effect of removing the Thread.Sleep(20) in ODEPr... | Justin Clark-Casey (justincc) | 2011-11-04 | 1 | -0/+3 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 1 | -1/+22 |
| |\ \
| |/ |
|
| | * | Fix a bug I introduced yesterday in ODE physics where prim scripts would only... | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -1/+22 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -14/+4 |
| |\ \
| |/ |
|
| | * | Remove unused fields from CollisionEventUpdate | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -1/+1 |
| | * | When sending object collision updates, don't null out and recreate the Collis... | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -13/+3 |
| * | | Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmerge | Melanie | 2011-10-25 | 1 | -18/+13 |
| |\ \
| |/ |
|
| | * | Remove unnecessary lock of OdeLock in OdePrim.changeadd() | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -18/+13 |
| * | | Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+2 |
| |\ \
| |/ |
|
| | * | minor: method doc to explain a lock of OdeLock | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -0/+2 |
| * | | Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmerge | Melanie | 2011-10-25 | 1 | -9/+4 |
| |\ \
| |/ |
|
| | * | Remove the unused CollisionLocker from ODE | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -9/+4 |
| * | | Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmerge | Melanie | 2011-10-25 | 1 | -19/+17 |
| |\ \
| |/ |
|
| | * | restrict unnecessary access levels on ODEPrim fields/properties | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -19/+17 |
| * | | Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge | Melanie | 2011-10-25 | 1 | -76/+114 |
| |\ \
| |/ |
|
| | * | refactor: make methods that do not need to be public in ODE private or intern... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -76/+114 |
| * | | Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+2 |
| |\ \
| |/ |
|
| | * | adjust some whitespace to trigger another build, to check the last failure wa... | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -2/+2 |
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -152/+151 |
| |\ \
| |/ |
|
| | * | Move common gemo/agent map name code into CreateGeom() | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -11/+5 |
| | * | Instead of preserving old name in geom_name_map in change size or shape, use ... | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -7/+3 |
| | * | On geom removal, remove the name from the OdeScene.geom_name_map too | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -0/+1 |
| | * | remove the unused ODEPrim.prev_geom field | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -3/+0 |
| | * | When an ODE geom is removed (as when a non-phantom prim is deleted, resized o... | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -0/+2 |
| | * | refactor: centralize prim geom removal code from four places to one | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -26/+37 |
| | * | minor: add note to RemovePrimThreadLocked() to the effect that it contrary to... | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -1/+1 |
| | * | If a prim changes size or shape, add actor to _parent_scene.actor_name_map wi... | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -1/+4 |
| | * | Remove _mesh field since the mesh data no longer needs to be stored after it'... | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -49/+16 |
| | * | refactor: Remove argument to pass in an initial mesh to OdePrim since this is... | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -2/+1 |
| | * | minor: correct method doc for last commit | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -1/+1 |
| | * | refactor: rename CreateGeom _mesh argument to mesh, so as to not confuse this... | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -3/+3 |
| | * | minor: method doc | Justin Clark-Casey (justincc) | 2011-07-31 | 1 | -3/+20 |
| | * | Refactor: Replace instances of m_isphysical with IsPhysical rather than have ... | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -33/+40 |
| | * | refactor: Rename ODEPrim.ParentPrim() to AddChildPrim() for code readability | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -11/+14 |
| | * | minor: remove mono compiler warnings, some code spacing adjustments | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -1/+1 |
| | * | minor: Add method doc to collision subscription methods. Change method case ... | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -2/+2 |
