aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'teravuswork' into avinationMelanie2012-11-2011-82/+668
|\
| * * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-178-19/+127
| | | | | | | | * Last step is to flip the throttle distribution.
| * Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-15337-30953/+13136
| | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * Merge master into teravusworkteravus2012-11-15336-13123/+30950
| |\
| | * Merge branch 'master' into careminsterMelanie2012-11-050-0/+0
| | |\
| | | * Change user message on TeskInventoryAccepted to let the viewer format itMelanie2012-11-051-5/+5
| | | | | | | | | | | | | | | | properly
| | * | Merge branch 'avination' into careminsterMelanie2012-11-040-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
| | * \ \ Merge branch 'master' into careminsterMelanie2012-11-041-9/+12
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Prevent IMs being sent to prims when avies decline inventory offers from them.Diva Canto2012-11-041-9/+12
| | | | |
| | * | | Merge branch 'master' into careminsterMelanie2012-11-0422-843/+1620
| | |\ \ \ | | | |/ /
| | | * | Add a method to query all registered script constants to allow non-XEngineMelanie2012-11-042-0/+18
| | | | | | | | | | | | | | | | | | | | script engines to use them.
| | | * | BulletSim: update the DLLs and SOsRobert Adams2012-11-034-0/+0
| | | | |
| | | * | BulletSim: fix compound linkset crash by not freeing shape of child prims.Robert Adams2012-11-036-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Remove all compilation warnings (mostly 'protected' in sealed classes.) Add the dynamicAabbEnable parameter to creation of compound shapes.
| | | * | BulletSim: search the mesh and hull lists to find shapes if type is not ↵Robert Adams2012-11-034-20/+96
| | | | | | | | | | | | | | | | | | | | known. This makes sure the correct accounting is done for the particular shape.
| | | * | BulletSim: Move construction of compound linkset from ShapeCollectionRobert Adams2012-11-033-61/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into LinksetCompound where it should be. Create meshes for native shapes when part of a compound linkset because scale is currently per object and not per collision shape. Don't schedule a LinksetCompound refresh if just changing properties.
| | | * | BulletSim: parameterize selection of linkset implementationRobert Adams2012-11-033-10/+24
| | | | |
| | | * | BulletSim: debugging of compound shape implementation of linksets.Robert Adams2012-11-0310-132/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add compound shape creation and freeing in shape manager. Add optional taint-time execution method and update code to use it. Add API2 linkage for more compound shape methods (get num, get/remove by index, ...) Modify perferred shape return so linkset children can have differet shapes than root. Add Position and Orientation calls to linksets so children can be moved around by the linkset by its own calculation. Allows for very general linkset implementations.
| | | * | BulletSim: Add RawPosition and RawOrientation to BSPhysObject and rename ↵Robert Adams2012-11-035-17/+39
| | | | | | | | | | | | | | | | | | | | MassRaw to RawMass. Fix BSShapeCollection to use Raw* for creating the body to eliminate exception from referencing the physical body before it has been created.
| | | * | BulletSim: Remove use of shapeData in ShapeCollection and rely on the ↵Robert Adams2012-11-037-266/+256
| | | | | | | | | | | | | | | | | | | | available BSPhysObject varaiables. Fix line endings in BSLinksetCompound.
| | | * | BulletSim: rename BSBody and BSShape to PhysBody and PhysShape. Add skeleton ↵Robert Adams2012-11-039-176/+328
| | | | | | | | | | | | | | | | | | | | of BSLinksetCompound.
| | | * | BulletSim: vehicle tweeking.Robert Adams2012-11-033-93/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add AddTorque() method to BSPrim. Remove some manual motor actions in computing angular force (will eventually be replaced with motor class). Remove some experimental changes.
| | | * | BulletSim: remove center-of-mass setting for linksets because it causes the ↵Robert Adams2012-11-035-54/+33
| | | | | | | | | | | | | | | | | | | | constraint calculation to pull the objects together.
| | | * | BulletSim: Use the PostTaints operation to build the linkset once before the ↵Robert Adams2012-11-032-124/+68
| | | | | | | | | | | | | | | | | | | | next simulation step. This eliminates the management of children vs taintChildren and simplifies the constratin creation code.
| | | * | BulletSim: Add gravity force to vehicle. Some debugging additions.Robert Adams2012-11-031-2/+6
| | | | |
| | | * | BulletSim: fix problem with multiple linksets stepping on each other if they ↵Robert Adams2012-11-031-3/+4
| | | | | | | | | | | | | | | | | | | | are built at the same time.
| | | * | BulletSim: add definitions for linkset collision maskRobert Adams2012-11-031-0/+3
| | | | |
| | | * | BulletSim: code rearrangementRobert Adams2012-11-032-8/+6
| | | | |
| | | * | BulletSim: Use Refresh/PostTaints to cause recomputing of constraint ↵Robert Adams2012-11-031-29/+36
| | | | | | | | | | | | | | | | | | | | variables before the simulation step. Update logging and messages to properly name LinksetConstraints. Use UpdatePhysicalMassProperties to put the whole linkset mass into all the physical linkset members so they have the inertia to move the whole linkset.
| | | * | BulletSim: add post taint taints and post step taints. The post taints ↵Robert Adams2012-11-031-16/+122
| | | | | | | | | | | | | | | | | | | | operation is most useful and is used by linksets to build and rebuild only once before the simulation step.
| | | * | BulletSim: remove unneeded parameter from Refresh().Robert Adams2012-11-031-1/+1
| | | | |
| | | * | BulletSim: centralize mass/inertia computation with ↵Robert Adams2012-11-033-18/+38
| | | | | | | | | | | | | | | | | | | | UpdatePhysicalMassProperties() function. Didn't add setMassRaw because assignment with side effect is dirty.
| | | * | BulletSim: rename constraint classes so they show up together alphabetically.Robert Adams2012-11-033-6/+6
| | | | |
| | | * | BulletSim: many small changes for vehicles simulation.Robert Adams2012-11-031-31/+40
| | | | |
| | | * | BulletSim: add ForEachMember(action) call for linkset.Robert Adams2012-11-031-8/+28
| | | | |
| | | * | BulletSim: Add activations after vehicle properties change. Problem was the ↵Robert Adams2012-11-031-12/+62
| | | | | | | | | | | | | | | | | | | | vehicle was going to sleep while waiting for commands. Make AddAngularForce work the same way as AddForce -- accumulates values and pushes them once into Bullet.
| | | * | BulletSim: correct spelling of Bullet call. It's 'swept' not 'sweep'.Robert Adams2012-11-033-3/+7
| | | | |
| | | * | BulletSim: Add banking and other new code to vechile dynamics. Add third ↵Robert Adams2012-11-0313-188/+351
| | | | | | | | | | | | | | | | | | | | party license and contributor in for for Aurora-Sim project for physics code.
| | | * | HG Suitcase Inventory: if RootFolder type doesn't work, look for any folder ↵Diva Canto2012-11-031-0/+9
| | | | | | | | | | | | | | | | | | | | with parentID=UUID.Zero
| | * | | Merge branch 'avination' into careminsterMelanie2012-11-0411-39/+72
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ Merge branch 'master' into careminsterMelanie2012-11-0312-123/+193
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ↵Diva Canto2012-11-026-80/+117
| | | | | | | | | | | | | | | | | | | | | | | | THESE.
| | | * | | Change to earlier commit for TargetVelocity to support distributed physics.Dan Lake2012-11-021-3/+3
| | | | | |
| | | * | | Add [AssetService] AllowRemoteDeleteAllTypes (default false).Justin Clark-Casey (justincc)2012-11-023-16/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows a closed grid to delete asset types other than maptile remotely. Only operational if AllowRemoteDelete = true also. Defaults to false - do not enable if anybody other than you can make asset service requests.
| | | * | | Move check to allow only deletion of maptiles up to AssetServerDeleteHandler ↵Justin Clark-Casey (justincc)2012-11-023-34/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from AssetService. This allows us to use a common check for both AssetService and XAssetService. It also allows future console commands to delete an asset. As before, deletion of maptile assets is not allowed remotely unless this is explicitly configured.
| | * | | | Merge branch 'master' into careminsterMelanie2012-11-015-5/+13
| | |\ \ \ \ | | | |/ / /
| | | * | | Comment out checks not to overwrite existing IAR/OAR files for now on "save ↵Justin Clark-Casey (justincc)2012-11-012-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | iar/oar" since this causes problems for some backup systems. Needs more thought, maybe an explicit --force/--overwrite switch Comments on http://opensimulator.org/mantis/view.php?id=6389
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-11-012-1/+7
| | | |\ \ \
| | | | * | | Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵Dan Lake2012-10-312-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No change to existing functions.
| | | * | | | Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit ↵Justin Clark-Casey (justincc)2012-11-011-0/+0
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version from libopenmetaverse commit 3731ee4 This is because macosx mono is 32-bit and this can't p/invoke 64-bit binaries. However, the reverse is also true. If OpenSimulator stops working for you then please complain! Long term alternative is probably to build a fat binary with both architectures.
| | * | | | Merge branch 'master' into careminsterMelanie2012-10-319-34/+83
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
generated by cgit v1.1 at 2024-12-14 12:14:52 +0000