Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update ubitMesh primMesher with new Dahlia version on core ( reckick git | UbitUmarov | 2012-07-19 | 1 | -143/+183 |
* | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 12 | -570/+1267 |
|\ | |||||
| * | Merge branch 'avination' into careminster | Melanie | 2012-07-16 | 6 | -136/+84 |
| |\ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 1 | -143/+183 |
| |\ \ | |||||
| | * | | update PrimMesher.cs to dll version r72 which fixes some path errors in slice... | dahlia | 2012-07-13 | 1 | -143/+183 |
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-07-11 | 5 | -62/+140 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 4 | -58/+107 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Clean up collision reporting code so they are properly passed to | Robert Adams | 2012-07-06 | 4 | -58/+107 |
| * | | | | Merge branch 'avination' into careminster | Melanie | 2012-07-06 | 1 | -11/+38 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-01 | 1 | -2/+3 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-06-30 | 1 | -2/+3 |
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-06-29 | 2 | -16/+16 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Move update of the final optional ODE total frame stat inside the OdeLock rat... | Justin Clark-Casey (justincc) | 2012-06-29 | 1 | -3/+3 |
| | * | | | | refactor: rename _collisionEventPrim to m_collisionEventActors and _collision... | Justin Clark-Casey (justincc) | 2012-06-29 | 1 | -12/+12 |
| | * | | | | Fix a regression where we stopped removing avatars from collision event repor... | Justin Clark-Casey (justincc) | 2012-06-29 | 1 | -1/+1 |
| * | | | | | Merge branch 'avination' into careminster | Melanie | 2012-06-06 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-06-02 | 1 | -60/+256 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | 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 | 2 | -4/+10 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-31 | 2 | -10/+143 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Add an optional mechanism for physics modules to collect and return arbitrary... | Justin Clark-Casey (justincc) | 2012-05-31 | 2 | -10/+143 |
| * | | | | | | | Merge branch 'avination' | Melanie | 2012-05-29 | 4 | -70/+134 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-05-27 | 4 | -154/+178 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-19 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | refactor: move EventQueueGet path generation into common method. Rename some... | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -1/+1 |
| | * | | | | | | | | Don't eagerly clear frame collision events when physics actors subscribe and ... | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -2/+8 |
| * | | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-05-15 | 2 | -11/+68 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-05-13 | 3 | -24/+69 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-05-13 | 3 | -106/+163 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-05-08 | 1 | -11/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-05-07 | 2 | -21/+108 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-05-05 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' | Melanie | 2012-05-03 | 1 | -5/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' | Melanie | 2012-05-02 | 3 | -112/+123 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' | Melanie | 2012-04-29 | 4 | -219/+314 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |