aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-0420-315/+488
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-042-47/+73
| |\
| | * Merge branch 'master' of ssh://opensim/var/git/opensimteravus2013-02-038-31/+72
| | |\
| | | * Merge /home/opensim/src/opensimBlueWall2013-02-0168-69/+69
| | | |\
| | | | * Revert "Update assembly version numbers"BlueWall2013-02-0168-69/+69
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-02-012-18/+33
| | | |\ \
| | | * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-02-019-34/+75
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | * | | Update assembly version numbersBlueWall2013-02-0168-69/+69
| | * | | | Adds the ability to load more then one IClientNetworkServer thereby allowing ...teravus2013-02-032-47/+73
| * | | | | Remove [XMLRPC] section I added by accident to the top of OpenSimDefaults.ini...Justin Clark-Casey (justincc)2013-02-041-15/+0
| | |_|_|/ | |/| | |
| * | | | minor: change comment about assuming script references are textures in UuidGa...Justin Clark-Casey (justincc)2013-02-021-1/+2
| * | | | Log missing assets on "fcache assets" found. This ignores references found b...Justin Clark-Casey (justincc)2013-02-022-17/+31
| | |_|/ | |/| |
| * | | Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantomJustin Clark-Casey (justincc)2013-02-022-3/+3
| * | | Stop exceptions being thrown if GenerateMapTiles = false but no static map ti...Justin Clark-Casey (justincc)2013-02-024-10/+36
| |/ /
| * | Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.teravus2013-02-011-2/+3
| * | BulletSim: fix problem where editting a physical linkset caused theRobert Adams2013-02-012-19/+33
| |/
| * BulletSim: fix crash caused when linksets were rebuilt. A problem addedRobert Adams2013-01-315-80/+106
| * BulletSim: make sure vehicle physical properties are set when goingRobert Adams2013-01-315-46/+35
| * BulletSim: clean up TargetVelocity implementation by using the default defn i...Robert Adams2013-01-312-14/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-01-312-1/+5
| |\
| * | Move the JsonStore regular expressions to static variables to avoidMic Bowman2013-01-312-87/+190
* | | Merge branch 'master' into careminsterMelanie2013-01-311-1/+1
|\ \ \ | | |/ | |/|
| * | Whitespace fix and removing unneccessary parenthesesMelanie2013-01-311-1/+1
* | | Merge branch 'avination' into careminsterMelanie2013-01-310-0/+0
|\ \ \
| * | | * This adds a bit more to the previous flying roll effect by adding additiona...teravus2013-01-311-10/+50
| * | | * Adds a satisfying angular roll when an avatar is flying and turning. (Gene...Melanie2013-01-312-2/+84
* | | | Merge branch 'avination' into careminsterMelanie2013-01-312-239/+239
|\ \ \ \ | |/ / /
| * | | Change keyframe motion to use a single timer for all objects. This is requiredMelanie2013-01-301-236/+229
| * | | Change default avatar replacements to be ruth rather than urban maleMelanie2013-01-281-13/+10
| * | | Send moving_end event to scripts when keyframed motion ends.Melanie2013-01-271-0/+10
* | | | 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
| |\ \