aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Add regression TestJsonSetValueJson()Justin Clark-Casey (justincc)2013-02-121-0/+58
| * | Add regression TestJsonGetValueJson()Justin Clark-Casey (justincc)2013-02-111-0/+33
| * | Add regression TestJsonTestPathJson()Justin Clark-Casey (justincc)2013-02-111-0/+32
| * | Add section to TestJsonGetValue() to test call on a sub-treeJustin Clark-Casey (justincc)2013-02-111-9/+21
| * | Extend TestJsonTestPath() for non-terminating section of path (i.e. one that ...Justin Clark-Casey (justincc)2013-02-111-8/+20
| * | Add section to TestJsonSetValue() to test attempted set of value where the pe...Justin Clark-Casey (justincc)2013-02-111-8/+23
| * | Add test to try reading notecard into an invalid path in TestJsonReadNotecard...Justin Clark-Casey (justincc)2013-02-111-7/+13
* | | Merge branch 'master' into careminsterMelanie2013-02-103-8/+57
|\ \ \ | |/ /
| * | Fix code to check for no spawn points. Possibly a merge artefact?Melanie2013-02-101-2/+4
| * | Additional ThreadPool worker and IOCP thread startup logicAllen Kerensky2013-02-101-6/+39
| * | Fix teleport/telehub issue:BlueWall2013-02-102-3/+17
* | | Merge branch 'master' into careminsterMelanie2013-02-1024-298/+792
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-0822-279/+697
| |\ \
| | * | Fixed ReadSculptData(): the check whether there are enough bytes to read was ...Oren Hurvitz2013-02-091-5/+6
| | * | Fixed check for 0 results in GetUserAccounts()Oren Hurvitz2013-02-091-1/+1
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0915-259/+712
| | |\ \
| | | * | BulletSim: add parameter to set global contact breaking threshold. Update DLL...Robert Adams2013-02-082-0/+7
generated by cgit v1.1 at 2024-12-25 09:39:06 +0000