aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-315-127/+200
|\
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-01-314-20/+96
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-01-303-0/+25
| | |\
| | * | Add config option to Regions.ini for new maptile featureBlueWall2013-01-301-0/+1
| | * | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ...Jak Daniels2013-01-303-20/+95
| * | | Added option for UUID as command parameters. This lets the command handle the...Dan Lake2013-01-311-0/+4
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2013-01-3128-166/+1008
|\ \ \ | |/ /
| * | Add JsonTestStore to determine if a JsonStore is associated withMic Bowman2013-01-303-0/+25
| |/
| * * This adds a bit more to the previous flying roll effect by adding additiona...teravus2013-01-301-10/+50
| * * Adds a satisfying angular roll when an avatar is flying and turning. (Gene...teravus2013-01-302-1/+82
| * Add JsonDestroyStore() basic regression testJustin Clark-Casey (justincc)2013-01-301-0/+15
| * refactor: Make invocations of json store functions from the regression test s...Justin Clark-Casey (justincc)2013-01-301-42/+17
| * Add regression test for script func JsonRemoveValue()Justin Clark-Casey (justincc)2013-01-301-0/+52
| * Fix issue where lsl -> c# generation in co-operative termination mode did not...Justin Clark-Casey (justincc)2013-01-302-22/+171
| * BulletSim: fix physics repositioning when under ground to only happenRobert Adams2013-01-293-15/+50
| * minor: change name of json script tests to JsonStoreScriptModuleTests instead...Justin Clark-Casey (justincc)2013-01-291-1/+1
| * minor: remove EnableLogging() left over in CoopTerminationTestsJustin Clark-Casey (justincc)2013-01-291-1/+1
| * Try ignoring json tests if they can't be run due to being on <=.net 3.5Justin Clark-Casey (justincc)2013-01-291-6/+17
| * minor: Tidy up disabled logging on AssetTransactionModule for future use. Ma...Justin Clark-Casey (justincc)2013-01-291-8/+10
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-2920-103/+563
| |\
| | * BulletSim: enable angular vertical attraction.Robert Adams2013-01-282-3/+3
| | * BulletSim: first unit test: vehicle angular attractionRobert Adams2013-01-286-79/+152
| | * BulletSim: do not zero an avatar's standing velocity if it is standingRobert Adams2013-01-287-96/+118
| | * BulletSim: rename 'uint' to 'UInt32' to make clear the type that is passed to...Robert Adams2013-01-281-14/+14
| | * BulletSim: fix the trimming of colliders so only the top 25 are returned.Robert Adams2013-01-282-4/+4
| | * BulletSim: update Bullet with profiling disabled. This seems to fix the memor...Robert Adams2013-01-284-0/+0
| | * BulletSim: reorder dependencies for tests and specify path for meshing dll si...Robert Adams2013-01-271-3/+4
| | * BulletSim: fix reference path for BulletSim tests in prebuild.xmlRobert Adams2013-01-271-1/+1
| | * BulletSim: simplify the initialization of some of the parameters.Robert Adams2013-01-272-32/+23
| | * BulletSim: reinstate the supression of rotational velocity for vehiclesRobert Adams2013-01-271-1/+1
| | * BulletSim: add framework for BulletSim unit tests. No tests yet.Robert Adams2013-01-274-0/+224
| | * BulletSim: disable center-of-mass computation because it does not work yetRobert Adams2013-01-271-1/+1
| | * BulletSim: fix compile error from last commitRobert Adams2013-01-271-2/+2
| | * BulletSim: parameterize the value for gravity reduction for ground vehicles o...Robert Adams2013-01-273-11/+18
| | * BulletSim: first attempt at reporting top collidersRobert Adams2013-01-275-11/+43
| | * BulletSim: parameterize several vehicle debugging values: physical linear and...Robert Adams2013-01-273-9/+57
| | * BulletSim: finish the post step event for physical object actions. Modify veh...Robert Adams2013-01-273-13/+73
| * | minor: remove some mono compile warnings in XEngine.csJustin Clark-Casey (justincc)2013-01-291-2/+0
* | | Merge branch 'avination' into careminsterMelanie2013-01-274-44/+318
|\ \ \
| * | | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-272-7/+9
| * | | Reinstate cleaning objects from parcel when avatars sit on them. Instead do itMelanie2013-01-262-2/+2
| * | | Stop temp-on-rez object from being deleted while an avatar sits on themMelanie2013-01-261-1/+1
| * | | Merge branch 'teravuswork' into avinationMelanie2013-01-262-7/+277
| |\ \ \
| | * | | * This update is ugly as sin, but it 'fills in the blanks' of your appearance...teravus2013-01-261-4/+259
| | * | | Merge remote-tracking branch 'remotes/origin/avination' into teravusworkteravus2013-01-268-51/+90
| | |\ \ \
| | * | | | * Handle a NRE with Baked Textures that may result in a failed appearance. ...teravus2013-01-221-3/+18
| * | | | | bug fix: crash when too many collisions on a ode stepUbitUmarov2013-01-261-36/+40
| * | | | | Merge branch 'avination' into ubitworkUbitUmarov2013-01-2620-397/+413
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | revert the test, sending again appearance to self inUbitUmarov2013-01-171-1/+1
| * | | | | *TEST TEST TEST* don't send AvatarAppearance to selfUbitUmarov2013-01-171-1/+1