| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-31 | 1 | -1/+7 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | Log warning if mesh/sculpt asset couldn't be found by ↵ | Justin Clark-Casey (justincc) | 2012-10-30 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | ODEPrim.MeshAssetReceived() callback. Presumably this is now more useful if the false positive from the old method of loading mesh assets have been eliminated. | |||||
| | * | | Add asset != null check to ODEPrim.MeshAssetReceived instead of throwing ↵ | Justin Clark-Casey (justincc) | 2012-10-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | exception. In some cases (such as failure to receive response from asset service), it is possible for a null to be returned from IAssetService.Get(string, object, AssetRetrieved). | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-30 | 1 | -3/+2 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | Make MeshAssetReceived private. | Justin Clark-Casey (justincc) | 2012-10-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | Keep methods private unless they need to be opened up to external callers. Reduces analysis complexity. | |||||
| | * | | correct ODEPrim.MeshAssetReveived -> MeshAssetReceived | Justin Clark-Casey (justincc) | 2012-10-30 | 1 | -3/+2 | |
| | | | | ||||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-10-28 | 1 | -7/+13 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||||
| | * | | [UNTESTED] core Ode: let broken mesh physical prims collide with land as | UbitUmarov | 2012-10-19 | 1 | -6/+11 | |
| | | | | | | | | | | | | | the defaul basic box so they don't go off world. | |||||
| | * | | [UNTESTED] core Ode: stop trying to load a broken asset. Make broken | UbitUmarov | 2012-10-19 | 1 | -21/+97 | |
| | | | | | | | | | | | | | assets behave like phantom by Nebadon request | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 4 | -18/+26 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||||
| | * | | BulletSim: fix problem with avatars sinking into the ground. | Robert Adams | 2012-10-23 | 4 | -15/+23 | |
| | | | | | | | | | | | | | Change terrain activation state to DISABLE_SIMULATION for better performance. | |||||
| | * | | BulletSim: minor change to insure avatar body recreation when shape changes. | Robert Adams | 2012-10-23 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-23 | 10 | -374/+510 | |
| |\ \ \ | |/ / | ||||||
| | * | | BulletSim: remove chatty debug message. | Robert Adams | 2012-10-22 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh ↵ | Robert Adams | 2012-10-22 | 8 | -35/+51 | |
| | | | | | | | | | | | | | assets weren't already in the cache. Comment cleanups. | |||||
| | * | | BulletSim: fix problem of not rebuilding shape by clearing last rebuild ↵ | Robert Adams | 2012-10-22 | 2 | -2/+8 | |
| | | | | | | | | | | | | | failed flag in BSPrim.ForceBodyShapeRebuild() | |||||
| | * | | BulletSim: remove trailing spaces to make git happy. | Robert Adams | 2012-10-22 | 8 | -36/+36 | |
| | | | | ||||||
| | * | | BulletSim: encorporate UBit's suggestion to save a copy of mesh raw data. | Robert Adams | 2012-10-22 | 1 | -2/+1 | |
| | | | | ||||||
| | * | | BulletSim: Create LinkSet abstract class and sparate constraint based ↵ | Robert Adams | 2012-10-22 | 3 | -319/+434 | |
| | | | | | | | | | | | | | linksets into own subclass. Will eventually add manual movement linkset subclass. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-23 | 1 | -12/+14 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Framework/LandData.cs | |||||
| | * | | minor: remove unnecessary bit of method doc from ↵ | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -3/+0 | |
| | | | | | | | | | | | | | OdePrim.BadMeshAssetCollideBits that monodevelop inserted automatically | |||||
| | * | | Fix minor issues from commit 28483150 | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -12/+17 | |
| | | | | | | | | | | | | | Fix spelling of collide, change to more self-documenting property BadMeshAssetCollideBits, add method doc, change to private to reduce code analysis complexity | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-20 | 7 | -406/+623 | |
| |\ \ \ | |/ / | ||||||
| | * | | BulletSim: add asset fetching so BulletSim works with new physics asset ↵ | Robert Adams | 2012-10-19 | 4 | -165/+240 | |
| | | | | | | | | | | | | | | | | | | | handling. Refactor some names to make them available for the asset tracking and fetching. | |||||
| | * | | BulletSim: reorder avatar collision checking to eliminate double collision_end. | Robert Adams | 2012-10-19 | 6 | -35/+43 | |
| | | | | | | | | | | | | | | | | | | | Various tweekings to avatar shape/mass/inertia/etc. Remove change from avatar radius to diameter. But still the avatar sinks. Collision_end now happens immediately rather than at the next subscription time. | |||||
| | * | | BulletSim: change nonimal physics frame rate to 55 to give same numbers as ODE. | Robert Adams | 2012-10-19 | 6 | -52/+57 | |
| | | | | | | | | | | | | | | | | | | | Change character scaling to represent size of capsule (diameter rather than radius) Modify create capsule call to pass radius and height. Eliminate errors when calculating shape inertia (should have some type checking). | |||||
| | * | | BulletSim: remove code in ShapeCollection that hinted at shape sharing. | Robert Adams | 2012-10-19 | 5 | -161/+138 | |
| | | | | | | | | | | | | | | | | Add new function to ParameterDefn for calling BulletSimAPI to set values. Tweaking to BSCharacter parameter setting to try and have avatars stand. | |||||
| | * | | BulletSim: Fix small problems with last patch: BSScene.World properly ↵ | Robert Adams | 2012-10-19 | 3 | -11/+6 | |
| | | | | | | | | | | | | | initialized and setting of C++ parameters commented out. Comments and logging added. | |||||
| | * | | BulletSim: Update BSCharacter to use API2 interface. | Robert Adams | 2012-10-19 | 6 | -93/+250 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Add capsule shape to BSShapeCollection(). Remember last updated values so inter frame diffs can be computed. Parameterize avatarStandingFriction and reduce to 10 from 999. The latter high value made avatars very hard to push. Set CCD parameters for prims and characters of specified. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-19 | 1 | -6/+11 | |
| |\ \ \ | |/ / | ||||||
| | * | | [UNTESTED] core Ode: let broken mesh physical prims collide with land as | UbitUmarov | 2012-10-19 | 1 | -6/+11 | |
| | | | | | | | | | | | | | the defaul basic box so they don't go off world. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-19 | 1 | -21/+97 | |
| |\ \ \ | |/ / | ||||||
| | * | | [UNTESTED] core Ode: stop trying to load a broken asset. Make broken | UbitUmarov | 2012-10-19 | 1 | -21/+97 | |
| | | | | | | | | | | | | | assets behave like phantom by Nebadon request | |||||
| | * | | missing changed file | UbitUmarov | 2012-10-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| | * | | i update core ode plugin and make it load is meshs (i hope) | UbitUmarov | 2012-10-18 | 2 | -2/+51 | |
| | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-10-18 | 17 | -1163/+2271 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||||
| | * | | coment a debug warning | UbitUmarov | 2012-10-16 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | fixes | UbitUmarov | 2012-10-16 | 3 | -67/+82 | |
| | | | | ||||||
| | * | | missing file | UbitUmarov | 2012-10-13 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | add mesh cache expire on region startup. Expires will be relative to | UbitUmarov | 2012-10-13 | 4 | -3/+88 | |
| | | | | | | | | | | | | | | | | | | | previus expire (assumed done only once at startup). File 'cntr' on cache folder stores time. Deleting it will force a skip on expire. Default time is 48hours before previus startup to account for failed ones etc. | |||||
| | * | | retouch mesh ids | UbitUmarov | 2012-10-13 | 2 | -11/+21 | |
| | | | | ||||||
| | * | | missing file (again) | UbitUmarov | 2012-10-13 | 1 | -4/+8 | |
| | | | | ||||||
| | * | | longer meshs identification keys, so first part on disk cache is it's asset id | UbitUmarov | 2012-10-13 | 1 | -1/+3 | |
| | | | | ||||||
| | * | | missing file | UbitUmarov | 2012-10-12 | 1 | -0/+6 | |
| | | | | ||||||
| | * | | [TEST] disk cache meshs | UbitUmarov | 2012-10-12 | 3 | -282/+532 | |
| | | | | ||||||
| | * | | commit the right files! | UbitUmarov | 2012-10-12 | 2 | -5737/+4763 | |
| | | | | ||||||
| | * | | remove some more debug spam on ode | UbitUmarov | 2012-10-12 | 2 | -4766/+5735 | |
| | | | | ||||||
| | * | | add some quaternion normalizations to keep errors under control | UbitUmarov | 2012-10-10 | 1 | -0/+3 | |
| | | | | ||||||
| | * | | debug | UbitUmarov | 2012-10-10 | 1 | -0/+6 | |
| | | | | ||||||
| | * | | fix debug :) | UbitUmarov | 2012-10-09 | 1 | -1/+1 | |
| | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |