| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | Instead of having scene add/remove collision events directly to the OdeScene ... | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -20/+38 |
| * | use a more efficient dictionary in OdeScene._collisionEventPrim rather than a... | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -7/+4 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 2 | -1/+4 |
|\ \
| |/ |
|
| * | Add comment for experimental effect of removing the Thread.Sleep(20) in ODEPr... | Justin Clark-Casey (justincc) | 2011-11-04 | 2 | -1/+4 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-04 | 1 | -2/+25 |
|\ \
| |/ |
|
| * | Stop llPushObject() from causing problems by adding force via a taint rather ... | Justin Clark-Casey (justincc) | 2011-11-04 | 1 | -2/+25 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-30 | 1 | -68/+58 |
|\ \
| |/ |
|
| * | Add taint target velocity for ODECharacters as is already done for ODECharact... | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -7/+12 |
| * | tidy up OdeCharacter so that we just use OpenMetaverse.Vector3 assignment dir... | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -51/+39 |
| * | Move position set from taint to logically better position at top of ODECharac... | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -12/+12 |
| * | Stop setting _position as well as m_taint_position in ODECharacter.Position | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -4/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 2 | -1/+24 |
|\ \
| |/ |
|
| * | Fix a bug I introduced yesterday in ODE physics where prim scripts would only... | Justin Clark-Casey (justincc) | 2011-10-27 | 2 | -1/+24 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 2 | -2/+2 |
|\ \
| |/ |
|
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 6 | -53/+45 |
|\ \
| |/ |
|
| * | Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from... | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+2 |
| * | Remove unused fields from CollisionEventUpdate | Justin Clark-Casey (justincc) | 2011-10-25 | 5 | -28/+10 |
| * | Get rid of the pointless null checks on collision listeners. Add warning abo... | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+6 |
| * | When sending object collision updates, don't null out and recreate the Collis... | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -13/+8 |
| * | For ScenePresence collision events, instead of creating a new CollisionEvents... | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -5/+11 |
| * | Fix bug where collision event listeners were not removed once the listener ha... | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -4/+5 |
| * | minor: rename a parameter in OdeScene.Simulate() from actor -> prim since it'... | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -4/+4 |
* | | Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+3 |
|\ \
| |/ |
|
| * | very minor removal of old commented out line of code in OdeScene | Justin Clark-Casey (justincc) | 2011-10-21 | 1 | -5/+3 |
* | | Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+0 |
|\ \
| |/ |
|
| * | remove unnecessary null check on _collisionEventPrim | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -3/+0 |
* | | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge | Melanie | 2011-10-25 | 1 | -22/+23 |
|\ \
| |/ |
|
| * | Get OdeScene to use passed in time step rather than hard-coded 0.089 | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -22/+23 |
* | | Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge | Melanie | 2011-10-25 | 2 | -13/+5 |
|\ \
| |/ |
|
| * | For now, stop passing timeStep into methods where it's not actually used. | Justin Clark-Casey (justincc) | 2011-10-20 | 2 | -13/+5 |
* | | Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+6 |
|\ \
| |/ |
|
| * | Temporarily put in log lines to record time taken to set terrain in OdeScene. | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -0/+6 |
* | | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+10 |
|\ \
| |/ |
|
| * | Store scene identifier passed in to OdeScene for later debug messages | Justin Clark-Casey (justincc) | 2011-10-18 | 2 | -2/+10 |
* | | Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge | Melanie | 2011-10-25 | 1 | -16/+13 |
|\ \
| |/ |
|
| * | Don't bother taking OdeLock during OdeScene construction, since there can be ... | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -16/+13 |
* | | 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 | 2 | -1/+3 |
|\ \
| |/ |
|
| * | minor: method doc to explain a lock of OdeLock | Justin Clark-Casey (justincc) | 2011-10-18 | 2 | -1/+3 |
* | | Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmerge | Melanie | 2011-10-25 | 4 | -97/+81 |
|\ \
| |/ |
|
| * | Remove the unused CollisionLocker from ODE | Justin Clark-Casey (justincc) | 2011-10-18 | 4 | -97/+81 |
* | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -0/+1 |
* | | Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmerge | Melanie | 2011-10-25 | 2 | -53/+36 |
|\ \
| |/ |
|
| * | reduce access to ODECharacter methods to make code analysis easier. Eliminat... | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -54/+36 |
* | | 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 |