aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-236-52/+83
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-222-42/+87
| |\
| | * minor: Add doc to ScenePresence.IsInTransit to make it clear that this is set...Justin Clark-Casey (justincc)2013-02-221-0/+6
| | * Make reset of EntityTransferStateMachine for an avatar transfer always happen...Justin Clark-Casey (justincc)2013-02-221-42/+81
| * | Added new Util function for reading config vars that's more generic than the ...Diva Canto2013-02-224-7/+8
| |/
* | Merge branch 'master' into careminsterMelanie2013-02-2246-638/+921
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-212-2/+2
| |\
| | * minor: Change summary in "show appearance" console command to "incomplete" ra...Justin Clark-Casey (justincc)2013-02-212-2/+2
| * | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as de...Diva Canto2013-02-214-11/+27
| |/
| * BulletSim: add OutOfBounds logic and some position sanity checkingRobert Adams2013-02-215-33/+68
| * Add a method to IStatsCollector for returning stats as an OSDMap.Robert Adams2013-02-201-0/+5
| * Add flush after write feature to LogWriterRobert Adams2013-02-201-1/+12
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-2019-111/+18
| |\
| | * Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-194-96/+3
| | * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-1915-15/+15
| * | Correct mistake in parsing 'show object pos' and similar pos commands where t...Justin Clark-Casey (justincc)2013-02-201-5/+5
| |/
| * minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linde...Justin Clark-Casey (justincc)2013-02-202-5/+5
| * Convert JsonTestPath() use in json regression tests to JsonGetPathType() insteadJustin Clark-Casey (justincc)2013-02-191-10/+10
| * minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArray...Justin Clark-Casey (justincc)2013-02-181-1/+1
| * BulletSim: experimental lock axis code using constraints. Not enabledRobert Adams2013-02-172-22/+74
| * BulletSim: add calls for creating all the different Bullet constraint types.Robert Adams2013-02-175-47/+338
| * BulletSim: rework parameter setting for different types of valuesRobert Adams2013-02-175-394/+348
| * * Fix walking to <NaN, NaN, NaN> via autopilot.teravus2013-02-161-1/+5
| * BulletSim: fix physical object appearing to slowly float off whenRobert Adams2013-02-161-1/+1
| * Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
* | Merge branch 'master' into careminsterMelanie2013-02-1611-278/+444
|\ \ | |/
| * Separate IAR tests into separate files for load/save/loadpath testsJustin Clark-Casey (justincc)2013-02-163-245/+198
| * Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.Justin Clark-Casey (justincc)2013-02-162-1/+60
| * Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-1610-34/+188
* | Merge branch 'master' into careminsterMelanie2013-02-1510-81/+243
|\ \ | |/
| * Enable one sub-test in TestJsonSetValue() which now works (using identifier w...Justin Clark-Casey (justincc)2013-02-151-17/+13
| * Rename JsonSetValueJson() -> JsonSetJson() and JsonGetValueJson() -> JsonGetJ...Justin Clark-Casey (justincc)2013-02-152-15/+15
| * Comment out regression TestJsonTestPath and TestJsonTestPathJson as these wil...Justin Clark-Casey (justincc)2013-02-151-62/+62
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-152-7/+9
| |\
| | * * Handle null check on configs in module startup so that the the code can be ...teravus2013-02-142-7/+9
| * | Add regression TestJsonList2Path()Justin Clark-Casey (justincc)2013-02-151-2/+27
| |/
| * Add regression TestGetArrayLength()Justin Clark-Casey (justincc)2013-02-141-0/+33
| * Add regression TestJsonGetPathType()Justin Clark-Casey (justincc)2013-02-141-0/+47
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2013-02-142-2/+2
| * Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and JsonA...Justin Clark-Casey (justincc)2013-02-143-8/+8
| * Make new JsonStore script constants separated with underscores, to be consist...Justin Clark-Casey (justincc)2013-02-141-5/+5
| * Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-142-0/+57
| * Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-142-5/+26
* | Merge branch 'avination' into careminsterMelanie2013-02-142-5/+26
|\ \
| * | Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-142-5/+26
* | | Merge branch 'avination' into careminsterMelanie2013-02-142-20/+77
|\ \ \ | |/ /
| * | Small fix to sim features moduleMelanie2013-02-141-0/+2
| * | Revert "Make keyframes use the sim's frame timer"Melanie2013-02-121-8/+15
| * | Revert "Push updates from keyframe directly to the front of the output queue ...Melanie2013-02-124-44/+9
| * | Revert "Use actual time dilation for unqueued updates"Melanie2013-02-121-1/+1
generated by cgit v1.1 at 2024-10-28 03:32:31 +0000