aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-0814-58/+1216
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-071-6/+10
| |\
| | * Bulletsim: and the rotational friction.Vegaslon2013-05-071-3/+5
| | * BulletSim: Another way to create vehicle framed friction.Vegaslon2013-05-071-3/+5
| * | Added AvatarPickerSearch capability handler.Diva Canto2013-05-076-35/+393
| |/
| * BulletSim: normalize quaternian rotations when building compound linksets.Robert Adams2013-05-061-7/+7
| * BulletSim: properly free references to simple convex hull shapes. Didn'tRobert Adams2013-05-061-8/+37
| * Step 3: Commit the Avination XEstate estate comms handlerMelanie2013-05-073-0/+767
| * Step 2: commit the IEstateModuleInterface changes neededMelanie2013-05-071-1/+2
| * Step one of estate settings sharing - port the Avination Estate module (compl...Melanie2013-05-075-27/+71
* | Merge branch 'master' into careminsterMelanie2013-05-071-6/+6
|\ \ | |/
| * BulletSim: apply linear and angular friction in vehicle coordinatesRobert Adams2013-05-061-6/+6
* | Merge branch 'master' into careminsterMelanie2013-05-0612-268/+186
|\ \ | |/
| * BulletSim: remove friction calcuation from BSMotor and move linear andRobert Adams2013-05-067-67/+47
| * BulletSim: simplify parameter specification by reducing the number ofRobert Adams2013-05-062-191/+94
| * BulletSim: extend BSActorLockAxis to allow locking linear movement inRobert Adams2013-05-063-10/+28
| * Added new method to Remote Admin for reloading the estate settings. This is m...Diva Canto2013-05-061-0/+17
* | Merge branch 'master' into careminsterMelanie2013-05-061-5/+18
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-0653-1793/+2102
| |\
| * | Minor reordering of operations on NewUserConnection. The agent circuit needs ...Diva Canto2013-05-061-5/+17
* | | Merge branch 'master' into careminsterMelanie2013-05-0439-1668/+1429
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into bulletsim4Robert Adams2013-05-037-29/+69
| |\ \
| | * | Fix possible race condition with local region cache if a region was added aft...Justin Clark-Casey (justincc)2013-05-031-15/+28
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-031-0/+6
| | |\ \
| | * | | On startup, start scenes after we're set up all local scenes, rather than sta...Justin Clark-Casey (justincc)2013-05-036-14/+41
| * | | | BulletSim: zero vehicle motion when changing vehicle type.Robert Adams2013-05-036-26/+18
| * | | | BulletSim: prims with no cuts created with single convex hull shape.Robert Adams2013-05-024-2/+99
| * | | | BulletSim: Rebuild physical body if physical shape changes for mesh and hull.Robert Adams2013-05-024-24/+73
| * | | | Merge branch 'master' into bulletsim4Robert Adams2013-05-021-2/+9
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix inventory issueBlueWall2013-05-011-0/+6
| | |/ /
| * | | BulletSim: fix crash when mesh asset wasn't available when meshingRobert Adams2013-05-012-10/+19
| * | | BulletSim: rework LinksetCompound to work with new BSShape system.Robert Adams2013-05-011-106/+40
| * | | Merge branch 'master' into bulletsim4Robert Adams2013-05-0116-120/+586
| |\ \ \
| * | | | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working...Robert Adams2013-04-305-17/+50
| * | | | BulletSim: Add non-static BSShape.GetReference for getting another referenceRobert Adams2013-04-292-32/+102
| * | | | BulletSim: LinksetCompound work to disable collision for root andRobert Adams2013-04-291-14/+30
| * | | | BulletSim: remove trailing white space to make git happier. No functional cha...Robert Adams2013-04-2920-152/+152
| * | | | BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_phys...Robert Adams2013-04-2911-282/+282
| * | | | BulletSim: first cut at new linksetCompound shape building.Robert Adams2013-04-291-63/+27
| * | | | BulletSim: fix crash when creating new hull.Robert Adams2013-04-291-13/+14
| * | | | BulletSim: code for creating the avatar capsule shape.Robert Adams2013-04-291-0/+13
| * | | | BulletSim: massive refactor of shape classes. Removed shape specific code fro...Robert Adams2013-04-2920-1050/+290
| * | | | BulletSim: complete BSShape classes.Robert Adams2013-04-293-19/+316
* | | | | Merge branch 'master' into careminsterMelanie2013-05-019-25/+41
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-015-19/+20
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add in-code exaplanation for the change in cancellation signalling in STP 2.2...Justin Clark-Casey (justincc)2013-05-011-2/+0
| | * | | Update SmartThreadPool to latest version 2.2.3 with a major and minor change.Justin Clark-Casey (justincc)2013-05-015-19/+22
| * | | | Fix the long standing bug of items being delivered to lost and found or trash...Melanie2013-05-011-2/+3
| |/ / /
| * | | Fix CAPS to work like they should - do not send caps to the viewer if they're...Melanie2013-04-303-4/+18
* | | | Merge branch 'master' into careminsterMelanie2013-04-308-97/+548
|\ \ \ \ | |/ / /