| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-05-08 | 16 | -60/+1223 |
| |\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | ||||
| | * | Delete "" entry for AvatarPicker cap. | Diva Canto | 2013-05-07 | 1 | -1/+0 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-05-07 | 1 | -6/+10 |
| | |\ | |||||
| | | * | Bulletsim: and the rotational friction. | Vegaslon | 2013-05-07 | 1 | -3/+5 |
| | | | | | | | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| | | * | BulletSim: Another way to create vehicle framed friction. | Vegaslon | 2013-05-07 | 1 | -3/+5 |
| | | | | | | | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| | * | | Added AvatarPickerSearch capability handler. | Diva Canto | 2013-05-07 | 8 | -36/+400 |
| | |/ | |||||
| | * | BulletSim: normalize quaternian rotations when building compound linksets. | Robert Adams | 2013-05-06 | 1 | -7/+7 |
| | | | | | | | | | Attempt to fix vehicles being twisted off the ground when they go physical. | ||||
| | * | BulletSim: properly free references to simple convex hull shapes. Didn't | Robert Adams | 2013-05-06 | 1 | -8/+37 |
| | | | | | | | | | loose memory since shapes are shared but did mess up usage accounting. | ||||
| | * | Step 3: Commit the Avination XEstate estate comms handler | Melanie | 2013-05-07 | 3 | -0/+767 |
| | | | | | | | | | This adds estate-wide Teleport Home and Teleport All User Home as well | ||||
| | * | Step 2: commit the IEstateModuleInterface changes needed | Melanie | 2013-05-07 | 1 | -1/+2 |
| | | | |||||
| | * | Step one of estate settings sharing - port the Avination Estate module ↵ | Melanie | 2013-05-07 | 5 | -27/+71 |
| | | | | | | | | | (complete module) as changes are too extensive to apply manually | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-05-07 | 1 | -6/+6 |
| |\ \ | |/ | |||||
| | * | BulletSim: apply linear and angular friction in vehicle coordinates | Robert Adams | 2013-05-06 | 1 | -6/+6 |
| | | | | | | | | | and not world coordinates. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-05-06 | 12 | -268/+186 |
| |\ \ | |/ | |||||
| | * | BulletSim: remove friction calcuation from BSMotor and move linear and | Robert Adams | 2013-05-06 | 7 | -67/+47 |
| | | | | | | | | | | | | | | | angular friction computation into linear and angular movement code. The friction wasn't being applied properly. This will make it so vehicles don't drift as much and the drift is tunable by changing the friction timescales. | ||||
| | * | BulletSim: simplify parameter specification by reducing the number of | Robert Adams | 2013-05-06 | 2 | -191/+94 |
| | | | | | | | | | specifications required for simple properties with defaults. | ||||
| | * | BulletSim: extend BSActorLockAxis to allow locking linear movement in | Robert Adams | 2013-05-06 | 3 | -10/+28 |
| | | | | | | | | | addition to angular movement. Not enabled by anything yet. | ||||
| | * | Added new method to Remote Admin for reloading the estate settings. This is ↵ | Diva Canto | 2013-05-06 | 1 | -0/+17 |
| | | | | | | | | | meant to be called when some other program has changed the data on the backend. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-05-06 | 1 | -5/+18 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-05-06 | 82 | -5745/+7953 |
| | |\ | |||||
| | * | | Minor reordering of operations on NewUserConnection. The agent circuit needs ↵ | Diva Canto | 2013-05-06 | 1 | -5/+17 |
| | | | | | | | | | | | | | to be added earlier for some of the checks to work correctly. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-05-04 | 41 | -1670/+1431 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| | * | | Merge branch 'master' into bulletsim4 | Robert Adams | 2013-05-03 | 7 | -29/+69 |
| | |\ \ | |||||
| | | * | | Fix possible race condition with local region cache if a region was added ↵ | Justin Clark-Casey (justincc) | 2013-05-03 | 1 | -15/+28 |
| | | | | | | | | | | | | | | | | | after startup. | ||||
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-05-03 | 3 | -2/+8 |
| | | |\ \ | |||||
| | | * | | | On startup, start scenes after we're set up all local scenes, rather than ↵ | Justin Clark-Casey (justincc) | 2013-05-03 | 6 | -14/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | starting scenes before others have been created. This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created. http://opensimulator.org/mantis/view.php?id=6618 | ||||
| | * | | | | BulletSim: zero vehicle motion when changing vehicle type. | Robert Adams | 2013-05-03 | 6 | -26/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rebuild compound linkset of any child in the linkset changes shape. Comments and better detailed logging messages. | ||||
| | * | | | | BulletSim: prims with no cuts created with single convex hull shape. | Robert Adams | 2013-05-02 | 4 | -2/+99 |
| | | | | | | | | | | | | | | | | | | | | | Parameter added to enable/disable this feature. | ||||
| | * | | | | BulletSim: Rebuild physical body if physical shape changes for mesh and hull. | Robert Adams | 2013-05-02 | 4 | -24/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Properly rebuilds collision caches. Release asset data fetched when building mesh or hulls. | ||||
| | * | | | | Merge branch 'master' into bulletsim4 | Robert Adams | 2013-05-02 | 27 | -6362/+6369 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | Make default config directory "." | BlueWall | 2013-05-01 | 2 | -2/+2 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2013-05-01 | 24 | -6358/+6358 |
| | | |\ \ \ | | | |/ / | |||||
| | | * | | | Fix inventory issue | BlueWall | 2013-05-01 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory. | ||||
| | * | | | | BulletSim: fix crash when mesh asset wasn't available when meshing | Robert Adams | 2013-05-01 | 2 | -10/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | the first time. Debugging added for mesh/hull asset fetch. | ||||
| | * | | | | BulletSim: rework LinksetCompound to work with new BSShape system. | Robert Adams | 2013-05-01 | 1 | -106/+40 |
| | | | | | | | | | | | | | | | | | | | | | Not all working yet. | ||||
| | * | | | | Merge branch 'master' into bulletsim4 | Robert Adams | 2013-05-01 | 45 | -4928/+7293 |
| | |\ \ \ \ | |||||
| | * | | | | | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all ↵ | Robert Adams | 2013-04-30 | 5 | -17/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | working yet. | ||||
| | * | | | | | BulletSim: Add non-static BSShape.GetReference for getting another reference | Robert Adams | 2013-04-29 | 2 | -32/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to an existing shape instance. BSShapeNative rebuilds shape for all references. BSShapeCompound returns another reference copy if the compound shape already exists (for linksets). | ||||
| | * | | | | | BulletSim: LinksetCompound work to disable collision for root and | Robert Adams | 2013-04-29 | 1 | -14/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | child prims so compound shape can do all collisions. Don't try to build a compound linkset for non-physical linksets. Remove and replace root body when compound shape is added so collision cache is rebuilt. | ||||
| | * | | | | | BulletSim: remove trailing white space to make git happier. No functional ↵ | Robert Adams | 2013-04-29 | 20 | -152/+152 |
| | | | | | | | | | | | | | | | | | | | | | | | | | changes. | ||||
| | * | | | | | BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or ↵ | Robert Adams | 2013-04-29 | 11 | -282/+282 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 'm_physicsScene' to match coding conventions and reduce confusion. | ||||
| | * | | | | | BulletSim: first cut at new linksetCompound shape building. | Robert Adams | 2013-04-29 | 1 | -63/+27 |
| | | | | | | | |||||
| | * | | | | | BulletSim: fix crash when creating new hull. | Robert Adams | 2013-04-29 | 1 | -13/+14 |
| | | | | | | | |||||
| | * | | | | | BulletSim: code for creating the avatar capsule shape. | Robert Adams | 2013-04-29 | 1 | -0/+13 |
| | | | | | | | |||||
| | * | | | | | BulletSim: massive refactor of shape classes. Removed shape specific code ↵ | Robert Adams | 2013-04-29 | 20 | -1050/+290 |
| | | | | | | | | | | | | | | | | | | | | | | | | | from BSShapeCollection. Using BSShape* classes to hold references to shape. Simplified shape dependency callbacks. Remove 'PreferredShape' methods and have each class specify shape type. Disable compound shape linkset for a later commit that will simplify linkset implementation. | ||||
| | * | | | | | BulletSim: complete BSShape classes. | Robert Adams | 2013-04-29 | 3 | -19/+316 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into careminster | Melanie | 2013-05-01 | 24 | -6358/+6358 |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-05-01 | 1 | -2/+3 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | | Fix SmartThreadPool line endings in recent update from dos to unix | Justin Clark-Casey (justincc) | 2013-05-01 | 24 | -6358/+6358 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2013-05-01 | 37 | -4830/+6747 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |