| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-06-03 | 4 | -78/+83 |
|\ |
|
| * | Fix build break whree accidentally did inv.Folders rather than inv.Folders.Co... | Justin Clark-Casey (justincc) | 2012-06-02 | 1 | -1/+1 |
| * | minor: tidy up some comments | Justin Clark-Casey (justincc) | 2012-06-02 | 1 | -4/+2 |
| * | Fix various issues with http inventory | Justin Clark-Casey (justincc) | 2012-06-02 | 4 | -78/+85 |
* | | Merge branch 'avination' into careminster | Melanie | 2012-06-02 | 4 | -34/+63 |
|\ \ |
|
| * | | Fix LSL animation state reporting and animation state transitions on crossing | Melanie | 2012-06-01 | 2 | -8/+34 |
| * | | Fix impersonation, it got broken in a merge | Melanie | 2012-06-01 | 1 | -7/+10 |
| * | | Remove the kill record. Core has removed it long ago and it really does more ... | Melanie | 2012-06-01 | 1 | -19/+19 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-06-02 | 3 | -93/+270 |
|\ \ \
| | |/
| |/| |
|
| * | | Instead of updating sim stats root agent, child, objects and scripts accounts... | Justin Clark-Casey (justincc) | 2012-06-01 | 2 | -33/+14 |
| * | | Add optional total avatars, total prims and active prims stats to ODE plugin. | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+21 |
| * | | If OdeScene.Near() returns no collision contacts, then exit as early as possi... | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+4 |
| * | | Add optional stat for the other collision time per frame not spent in ODE nat... | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -1/+16 |
| * | | Add avatar forces calculation, prim force and raycasting per frame millisecon... | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+46 |
| * | | Collection optional avatar and prim taint frame millisecond times | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+36 |
| * | | Remove recent optional native collision frame milliseconds stat | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -13/+1 |
| * | | Add optional stat that records milliseconds spent notifying collision listene... | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+14 |
| * | | Add avatar and prim update milliseconds per frame optional stats | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+31 |
| * | | Add option native step frame ms stat | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+21 |
| * | | Add total ODE frame time optional stat, as a sanity check on the main scene p... | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+21 |
| * | | Break down native ODE collision frame time stat into native space collision a... | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -4/+22 |
| * | | Rename new collision stats to 'contacts' - there are/can be multiple contacts... | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -6/+6 |
| * | | Stop adding an unnecessary duplicate _perloopcontact if the avatar is standin... | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+4 |
| * | | minor: comment out currently unused OdeScene.sCollisionData | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+9 |
| * | | Add ODE avatar and prim collision numbers if extra stats collection is enabled. | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -5/+34 |
| * | | Fix OdeScene.GetTopColliders() to return the top 25 colliders rather than the... | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -19/+13 |
* | | | Merge branch 'avination' into careminster | Melanie | 2012-05-31 | 7 | -209/+236 |
|\ \ \
| | |/
| |/| |
|
| * | | ubitode prim: if makebody() is called already having a body, do a full destru... | UbitUmarov | 2012-05-30 | 1 | -3/+4 |
| * | | Guard setting the building flag | Melanie | 2012-05-30 | 1 | -0/+4 |
| * | | Whitespace fix | Melanie | 2012-05-30 | 1 | -1/+1 |
| * | | Prevent multiple requests to go physical from reaching the physics plugin | Melanie | 2012-05-30 | 1 | -0/+4 |
| * | | Fix the log standing attach-from-world bug. | Melanie | 2012-05-30 | 2 | -42/+59 |
| * | | fix physics not reporting collisions only with terrain | UbitUmarov | 2012-05-29 | 1 | -0/+1 |
| * | | Add advanced collision processing into ScenePresence | Melanie | 2012-05-29 | 1 | -162/+162 |
| * | | Fix collision filtering | Melanie | 2012-05-29 | 1 | -10/+10 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-31 | 7 | -69/+450 |
|\ \ \
| | |/
| |/| |
|
| * | | Add an optional mechanism for physics modules to collect and return arbitrary... | Justin Clark-Casey (justincc) | 2012-05-31 | 5 | -60/+252 |
| * | | Add console command "teleport user" to allow teleport from the region console | Justin Clark-Casey (justincc) | 2012-05-29 | 1 | -0/+189 |
| * | | Fix collision filtering. The filter should be checked on the receiving part! | Melanie | 2012-05-29 | 1 | -9/+9 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-29 | 3 | -238/+332 |
|\ \ \
| |/ / |
|
| * | | refactor: factor out entity transfer state machine into a separate class to m... | Justin Clark-Casey (justincc) | 2012-05-28 | 3 | -239/+330 |
| * | | If handling the failure of teleport, move agent state to CleaningUp when we s... | Justin Clark-Casey (justincc) | 2012-05-28 | 1 | -3/+6 |
* | | | Re-add script collisions that were lost in a merge | Melanie | 2012-05-29 | 1 | -0/+2 |
* | | | Merge branch 'avination' | Melanie | 2012-05-29 | 7 | -252/+245 |
|\ \ \
| | |/
| |/| |
|
| * | | fix avatars collisions on sim crossings and other few cases where freemove()... | UbitUmarov | 2012-05-28 | 1 | -2/+1 |
| * | | a bit cleaner code (?) on sculpts/meshs meshing checking | UbitUmarov | 2012-05-28 | 1 | -7/+6 |
| * | | let meshs work indenpendently of mesh_sculpted_prim config option | UbitUmarov | 2012-05-28 | 1 | -29/+25 |
| * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-05-28 | 2 | -180/+103 |
| |\ \ |
|
| | * | | Place the return back into collision sounds. | Melanie | 2012-05-28 | 1 | -0/+4 |
| | * | | If a region is not found on a simulator, make the health query return | Melanie | 2012-05-28 | 1 | -4/+13 |