| Commit message (Expand) | Author | Age | Files | Lines |
* | fix a bad reset of shapetype on pbshape change, added missing checksculpload... | UbitUmarov | 2012-03-21 | 1 | -7/+10 |
* | missed a creatMesh in chODE. temporary removed m_meshfailed test since it ma... | UbitUmarov | 2012-03-21 | 1 | -4/+9 |
* | shapetype support on chOde so it can also request a simple convex hull 'mesh' | UbitUmarov | 2012-03-21 | 2 | -34/+46 |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-21 | 19 | -325/+1047 |
|\ |
|
| * | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 17 | -297/+1023 |
| |\ |
|
| | * | Refix the fixed fix! | Melanie | 2012-03-21 | 1 | -2037/+2037 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 1 | -1/+1 |
| | |\ |
|
| | * | | Fixed borkness with map search introduce by my last changes to it. | Diva Canto | 2012-03-20 | 1 | -1/+1 |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 1 | -18/+7 |
| | |\ \ |
|
| | * | | | Fixed borkness with previous merge. | Diva Canto | 2012-03-20 | 1 | -16/+1 |
| | * | | | Line endings | Diva Canto | 2012-03-20 | 1 | -89/+89 |
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 32 | -318/+516 |
| | |\ \ \ |
|
| | * | | | | HG Friends: allow the establishment of HG friendships without requiring co-pr... | Diva Canto | 2012-03-20 | 14 | -2190/+2790 |
| | * | | | | Added GetUUID(first, last) on UserAgentsService so that we can finally make d... | Diva Canto | 2012-03-17 | 6 | -10/+136 |
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 1 | -1/+1 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | * | | | | fix compile error from last commit | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -1/+1 |
| | | |_|/
| | |/| | |
|
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 1 | -18/+7 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest() | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -18/+7 |
| | | |/
| | |/| |
|
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2012-03-21 | 6 | -153/+338 |
| |\ \ \ |
|
| * | | | | Move the health monitoring stuff where it will do some good | Melanie | 2012-03-21 | 1 | -3/+3 |
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -7/+14 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | Add ability to log warn if a frame takes longer than twice the expected time.... | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -7/+14 |
* | | | | | Changes of PrimShapeType should now work with UbitOde ( almost untested ) | UbitUmarov | 2012-03-21 | 2 | -3727/+3750 |
* | | | | | Tell physics about physics shape when creating. Added some virtual methods to... | UbitUmarov | 2012-03-21 | 5 | -5/+57 |
* | | | | | add convex state to mesh key, so a change is detected. | UbitUmarov | 2012-03-21 | 2 | -1/+9 |
| |_|/ /
|/| | | |
|
* | | | | Update prebuild | Melanie | 2012-03-20 | 1 | -24/+27 |
* | | | | Merge branch 'ubitwork' | Melanie | 2012-03-20 | 5 | -129/+311 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | let convex be a parameter to createMesh so it can be used. Was forced to add ... | UbitUmarov | 2012-03-21 | 4 | -7/+21 |
| * | | | added convex decomposition hulls support. Hardcoded to use mesh or this. (so... | UbitUmarov | 2012-03-20 | 1 | -18/+146 |
| * | | | WORK in progress!! Now it reads the simple hull shape to use if convex shape ... | UbitUmarov | 2012-03-20 | 2 | -124/+164 |
* | | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 13 | -196/+222 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Add prim name to "[MESH]: No recognized physics mesh..." log message | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 |
| * | | | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -2/+0 |
| * | | | remove unnecessary tmpFrameMS, use maintc instead for frame time calculation | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -3/+2 |
| * | | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-03-20 | 2 | -2/+2 |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 |
| |\ \ \ |
|
| | * | | | slight increase in jump power to make running jump slightly better. | nebadon | 2012-03-20 | 1 | -1/+1 |
| * | | | | Move frame loop entirely within Scene.Update() for better future performance ... | Justin Clark-Casey (justincc) | 2012-03-20 | 8 | -179/+213 |
| |/ / / |
|
* | | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 3 | -12/+24 |
|\ \ \ \
| |/ / / |
|
| * | | | reduce avatar verticle jump from the absurd 5 meter jump to a less | nebadon | 2012-03-20 | 1 | -1/+1 |
| * | | | refactor: precalculate the fixed movement factor for avatar tilting (sqrt(2))... | Justin Clark-Casey (justincc) | 2012-03-20 | 2 | -8/+16 |
| * | | | refactor: Eliminate unnecessary duplicate avCapsuleTilted | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -3/+7 |
* | | | | Merge branch 'ubitwork' | Melanie | 2012-03-20 | 3 | -6/+32 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | add some more notifications about changes on physical parameters ( still inc... | UbitUmarov | 2012-03-20 | 3 | -10/+14 |
* | | | | Cover the case where prims are loaded and ParentGroup is not yet set | Melanie | 2012-03-20 | 1 | -5/+10 |
|/ / / |
|
* | | | Cause prims to be saved if extra physics parameters are changed | Melanie | 2012-03-20 | 1 | -0/+5 |
* | | | Fix an invalid cast that only showed at runtime | Melanie | 2012-03-20 | 1 | -1/+1 |
* | | | Store and reload extra physics from database | Melanie | 2012-03-20 | 1 | -2/+20 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 18 | -65/+197 |
|\ \ \
| |/ / |
|
| * | | Remove pointless ThreadAbortException catching in a test that isn't run anyway. | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -11/+5 |