aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-221-1/+1
|\
| * Revert "Stop messing order of updates, destroing the defined order of the sel...Melanie2012-03-211-8/+3
* | reverted priorityQueue changesUbitUmarov2012-03-211-8/+3
|/
* Stop messing order of updates, destroing the defined order of the selected pr...UbitUmarov2012-03-211-3/+8
* minor cleanUbitUmarov2012-03-211-27/+24
* fix a bad reset of shapetype on pbshape change, added missing checksculpload...UbitUmarov2012-03-211-7/+10
* missed a creatMesh in chODE. temporary removed m_meshfailed test since it ma...UbitUmarov2012-03-211-4/+9
* shapetype support on chOde so it can also request a simple convex hull 'mesh'UbitUmarov2012-03-212-34/+46
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-2119-325/+1047
|\
| * Merge branch 'master' into careminsterMelanie2012-03-2117-297/+1023
| |\
| | * Refix the fixed fix!Melanie2012-03-211-2037/+2037
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-1/+1
| | |\
| | * | Fixed borkness with map search introduce by my last changes to it.Diva Canto2012-03-201-1/+1
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-18/+7
| | |\ \
| | * | | Fixed borkness with previous merge.Diva Canto2012-03-201-16/+1
| | * | | Line endingsDiva Canto2012-03-201-89/+89
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-2032-318/+516
| | |\ \ \
| | * | | | HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-2014-2190/+2790
| | * | | | Added GetUUID(first, last) on UserAgentsService so that we can finally make d...Diva Canto2012-03-176-10/+136
| * | | | | Merge branch 'master' into careminsterMelanie2012-03-211-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | fix compile error from last commitJustin Clark-Casey (justincc)2012-03-211-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'master' into careminsterMelanie2012-03-211-18/+7
| |\ \ \ \ | | |/ / /
| | * | | refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest()Justin Clark-Casey (justincc)2012-03-211-18/+7
| | | |/ | | |/|
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-216-153/+338
| |\ \ \
| * | | | Move the health monitoring stuff where it will do some goodMelanie2012-03-211-3/+3
| * | | | Merge branch 'master' into careminsterMelanie2012-03-201-7/+14
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add ability to log warn if a frame takes longer than twice the expected time....Justin Clark-Casey (justincc)2012-03-211-7/+14
* | | | | Changes of PrimShapeType should now work with UbitOde ( almost untested )UbitUmarov2012-03-212-3727/+3750
* | | | | Tell physics about physics shape when creating. Added some virtual methods to...UbitUmarov2012-03-215-5/+57
* | | | | add convex state to mesh key, so a change is detected.UbitUmarov2012-03-212-1/+9
| |_|/ / |/| | |
* | | | Update prebuildMelanie2012-03-201-24/+27
* | | | Merge branch 'ubitwork'Melanie2012-03-205-129/+311
|\ \ \ \ | |/ / / |/| | |
| * | | let convex be a parameter to createMesh so it can be used. Was forced to add ...UbitUmarov2012-03-214-7/+21
| * | | added convex decomposition hulls support. Hardcoded to use mesh or this. (so...UbitUmarov2012-03-201-18/+146
| * | | WORK in progress!! Now it reads the simple hull shape to use if convex shape ...UbitUmarov2012-03-202-124/+164
* | | | Merge branch 'master' into careminsterMelanie2012-03-2013-196/+222
|\ \ \ \ | | |/ / | |/| |
| * | | Add prim name to "[MESH]: No recognized physics mesh..." log messageJustin Clark-Casey (justincc)2012-03-201-1/+1
| * | | remove some mono compiler warningsJustin Clark-Casey (justincc)2012-03-201-2/+0
| * | | remove unnecessary tmpFrameMS, use maintc instead for frame time calculationJustin Clark-Casey (justincc)2012-03-201-3/+2
| * | | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-03-202-2/+2
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-201-1/+1
| |\ \ \
| | * | | slight increase in jump power to make running jump slightly better.nebadon2012-03-201-1/+1
| * | | | Move frame loop entirely within Scene.Update() for better future performance ...Justin Clark-Casey (justincc)2012-03-208-179/+213
| |/ / /
* | | | Merge branch 'master' into careminsterMelanie2012-03-203-12/+24
|\ \ \ \ | |/ / /
| * | | reduce avatar verticle jump from the absurd 5 meter jump to a lessnebadon2012-03-201-1/+1
| * | | refactor: precalculate the fixed movement factor for avatar tilting (sqrt(2))...Justin Clark-Casey (justincc)2012-03-202-8/+16
| * | | refactor: Eliminate unnecessary duplicate avCapsuleTiltedJustin Clark-Casey (justincc)2012-03-201-3/+7
* | | | Merge branch 'ubitwork'Melanie2012-03-203-6/+32
|\ \ \ \ | | |/ / | |/| |
| * | | add some more notifications about changes on physical parameters ( still inc...UbitUmarov2012-03-203-10/+14
* | | | Cover the case where prims are loaded and ParentGroup is not yet setMelanie2012-03-201-5/+10
|/ / /