aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-1513-103/+267
|\
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-1427-242/+983
| |\
| | * 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-153-7/+11
| | |\
| | | * * Handle null check on configs in module startup so that the the code can be ...teravus2013-02-142-7/+9
| | | * * gracefully handle a Situation where a double close is called on the WebSock...teravus2013-02-141-0/+2
| | * | 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
| * | Use SortedDictionary in StatsManager instead of regular Dictionary so stats w...Dan Lake2013-02-142-22/+22
* | | 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-125-46/+10
| * | | Revert "Use actual time dilation for unqueued updates"Melanie2013-02-121-1/+1
| * | | Use actual time dilation for unqueued updatesMelanie2013-02-121-1/+1
| * | | Push updates from keyframe directly to the front of the output queue ratherMelanie2013-02-125-10/+46
| * | | Make keyframes use the sim's frame timerMelanie2013-02-111-15/+8
| * | | Refactor KeyframeMotion to use one timer class per sceneMelanie2013-02-111-20/+75
| * | | Actually plumb the new values to physics.Melanie2013-02-071-0/+20
| * | | Rename "Bounce" to "Restitution" in PhysicsActor as well. It appears theseMelanie2013-02-071-1/+1
* | | | Merge branch 'master' into careminsterMelanie2013-02-145-15/+175
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix a very unlikely-to-occur NullReferenceException race condition in llPushO...Justin Clark-Casey (justincc)2013-02-141-2/+7
| * | | Adds a couple requested functions to the JsonStore scriptMic Bowman2013-02-134-1/+162
| * | | Make path parsing more robust in the JsonStore.Mic Bowman2013-02-121-12/+6
* | | | Merge branch 'master' into careminsterMelanie2013-02-1310-156/+522
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-1310-156/+522
| |\ \ \
| | * | | Add more sub-tests to TestJsonSetValue for paths containing []{} without {} d...Justin Clark-Casey (justincc)2013-02-131-5/+86
| | * | | Extend JsonTestSetValue() with tests for escaping brackets, periods and unbal...Justin Clark-Casey (justincc)2013-02-131-2/+71
| | * | | Add test for array as root element in TestJsonCreateStore()Justin Clark-Casey (justincc)2013-02-131-0/+9
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-139-141/+304
| | |\ \ \
| | | * | | BulletSim: fix density since the simulator/viewer track density in aRobert Adams2013-02-127-25/+150
| | | * | | BulletSim: More work on center-of-mass. Remove linksetinfo and rely on simula...Robert Adams2013-02-128-124/+162
| | * | | | Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arraysJustin Clark-Casey (justincc)2013-02-131-13/+57
| | |/ / /
| * | | | Make the sim features module register it's interface so it can be usedMelanie2013-02-131-0/+2
| |/ / /
* | | | Merge branch 'master' into careminsterMelanie2013-02-126-44/+272
|\ \ \ \ | |/ / /
| * | | Extend TestJsonCreateStore() with a one key input and an input with raw numbe...Justin Clark-Casey (justincc)2013-02-121-2/+20
| * | | Use an integer when specifying the XWorkItem wait rather than a TimeSpan to a...Justin Clark-Casey (justincc)2013-02-123-4/+13
| * | | Re-enable subtest for single quoted token in TestJsonSetValueJson()Justin Clark-Casey (justincc)2013-02-121-9/+9
| * | | Adds the parameter for OSD serialization to encode default values. ThisMic Bowman2013-02-122-5/+8
| | |/ | |/|
| * | Fix handling of string values in JsonSetValueJson(). There areMic Bowman2013-02-111-1/+31
generated by cgit v1.1 at 2024-11-05 11:20:32 +0000