aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-2116-296/+1018
|\
| * 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-2025-308/+509
| |\ \ \
| * | | | HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-2013-2189/+2785
| * | | | 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-215-129/+311
|\ \ \
| * \ \ 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
* | | | | 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
* | | | 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
|/ / /
* | | Cause prims to be saved if extra physics parameters are changedMelanie2012-03-201-0/+5
* | | Fix an invalid cast that only showed at runtimeMelanie2012-03-201-1/+1
* | | Store and reload extra physics from databaseMelanie2012-03-201-2/+20
* | | Merge branch 'master' into careminsterMelanie2012-03-2011-55/+190
|\ \ \ | |/ /
| * | Remove pointless ThreadAbortException catching in a test that isn't run anyway.Justin Clark-Casey (justincc)2012-03-201-11/+5
| * | Remove some pointless catching/throwing in the scene loop.Justin Clark-Casey (justincc)2012-03-201-7/+0
| * | Fix small typoJustin Clark-Casey (justincc)2012-03-201-1/+1
| * | Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at th...Justin Clark-Casey (justincc)2012-03-201-10/+16
| * | Add some doc about the EventManager.OnLoginsEnabled event.Justin Clark-Casey (justincc)2012-03-191-0/+7
| * | Fix a bug where logins to standalones would fail if the RegionReady module wa...Justin Clark-Casey (justincc)2012-03-191-7/+2
| * | Stop console command "xengine status" throwing an exception if there are no s...Justin Clark-Casey (justincc)2012-03-191-4/+4
| * | Fix configuration problems where XAssetDatabasePlugin was picked up accidenta...Justin Clark-Casey (justincc)2012-03-194-12/+153
| |/
* | Remove debug output using Console.WriteLine and trim excessive whitespaceMelanie2012-03-191-8/+0