| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| | | * | 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 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Util.cs | ||||
| | | * | | | | HG Friends: allow the establishment of HG friendships without requiring ↵ | Diva Canto | 2012-03-20 | 14 | -2190/+2790 |
| | | | | | | | | | | | | | | | | | | | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY. | ||||
| | | * | | | | Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵ | Diva Canto | 2012-03-17 | 6 | -10/+136 |
| | | | | | | | | | | | | | | | | | | | | | | | | | direct user connections. | ||||
| | * | | | | | 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 |
| | |\ \ \ | | | | | | | | | | | | | | | | careminster | ||||
| | * | | | | 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 ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -7/+14 |
| | | | | | | | | | | | | | | | | | | | | | time. Currently commented out. | ||||
| * | | | | | 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 ↵ | UbitUmarov | 2012-03-21 | 5 | -5/+57 |
| | | | | | | | | | | | | | | | | | | | | | to get/set density,gravmod, frition,bounce and shape type ( not in use ). UbitOde now should do convex type on creation or everytime the mesh is changed ( as in change size, shape, etc ) | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | it also to original mesher code and zeromesher | ||||
| | * | | | added convex decomposition hulls support. Hardcoded to use mesh or this. ↵ | UbitUmarov | 2012-03-20 | 1 | -18/+146 |
| | | | | | | | | | | | | | | | | | (so no simple hull of convex prims for now). | ||||
| | * | | | WORK in progress!! Now it reads the simple hull shape to use if convex shape ↵ | UbitUmarov | 2012-03-20 | 2 | -124/+164 |
| | | | | | | | | | | | | | | | | | is selected for a prim. Due to ODE limitations on convex hulls colisions, it creates a mesh. Being work in progress it is hardcoded to only read that simple convex hull for now. It writes a file named "lixo_lixo.raw" that can be imported into blender for examination of the created mesh (the last one loaded and also hardcoded). To play with put in opensim.ini "meshing = UbitMeshmerizer" | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 13 | -196/+222 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | | 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 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | analysis and stat accuracy. Update() now accepts a frames parameter which can control the number of frames updated. -1 will update until shutdown. The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame. | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | absurd 3m vertical jump to better match what you would see in Second Life and be more in line with what users would expect. | ||||
| | * | | | refactor: precalculate the fixed movement factor for avatar tilting ↵ | Justin Clark-Casey (justincc) | 2012-03-20 | 2 | -8/+16 |
| | | | | | | | | | | | | | | | | | (sqrt(2)) rather than doing it multiple times on every move. | ||||
| | * | | | 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 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | | | add some more notifications about changes on physical parameters ( still ↵ | UbitUmarov | 2012-03-20 | 3 | -10/+14 |
| | | | | | | | | | | | | | | | | | incomple and there should be a better away ) | ||||
| * | | | | 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 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs | ||||
| | * | | Remove pointless ThreadAbortException catching in a test that isn't run anyway. | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -11/+5 |
| | | | | |||||
| | * | | Remove some pointless catching/throwing in the scene loop. | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -7/+0 |
| | | | | |||||
| | * | | Fix small typo | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at ↵ | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -10/+16 |
| | | | | | | | | | | | | | | | | | | | the same time. Have to lock m_MeshToTriMeshMap as property is static and with more than one region two scene loops could try to manipulate at the same time. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |