aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-1612-298/+533
|\
| * 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
| | | | | | | | | | | | | | | | Really "My Inventory" is just the name of the root, it isn't a folder in its own right. This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /* /* will still work and this is a special case just for the root If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/* Added a regression test for this case.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-162-22/+22
| |\
| * | Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-1611-54/+277
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-1513-103/+267
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-02-1432-242/+983
| |\ \ | | |/
| | * Enable one sub-test in TestJsonSetValue() which now works (using identifier ↵Justin Clark-Casey (justincc)2013-02-151-17/+13
| | | | | | | | | | | | | | | | | | | | | with embedded .). Need to look further at other still commented tests. Still need to check coverage against some of Mic's scripts.
| | * Rename JsonSetValueJson() -> JsonSetJson() and JsonGetValueJson() -> ↵Justin Clark-Casey (justincc)2013-02-152-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | JsonGetJson() This is because JsonGetJson() is getting json from anywhere in the structure, not just values. Equally, JsonSetJson() is setting any type of json, not just json which represents a value. Agreed with cmickeyb
| | * Comment out regression TestJsonTestPath and TestJsonTestPathJson as these ↵Justin Clark-Casey (justincc)2013-02-151-62/+62
| | | | | | | | | | | | will go away soon
| | * 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
| | | | | | | | | | | | | | | | run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement...
| | | * * gracefully handle a Situation where a double close is called on the ↵teravus2013-02-141-0/+2
| | | | | | | | | | | | | | | | WebSocket handler
| | * | 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 ↵Justin Clark-Casey (justincc)2013-02-143-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | JsonArrayLength() -> JsonGetArrayLength() This is for consistentency with the verb:noun naming approach existing json script functions and other script functions. Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions. As agreed with cmickeyb
| | * Make new JsonStore script constants separated with underscores, to be ↵Justin Clark-Casey (justincc)2013-02-141-5/+5
| | | | | | | | | | | | | | | | | | consistent with existing LSL/OSSL, etc script constants. Agreed with cmickeyb
| | * Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-142-0/+57
| | | | | | | | | | | | from the physical scene. Invocations added in SceneObjectPart.
| * | Use SortedDictionary in StatsManager instead of regular Dictionary so stats ↵Dan Lake2013-02-142-22/+22
| | | | | | | | | | | | will interate and print in a defined order
* | | Merge branch 'master' into careminsterMelanie2013-02-140-0/+0
|\ \ \ | | |/ | |/|
| * | 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
| | | | | | | | | | | | | | | | This reverts commit e85a6237bfc0f00de4a183e29e515fa5baf1aa7f.
| * | | Revert "Push updates from keyframe directly to the front of the output queue ↵Melanie2013-02-125-46/+10
| | | | | | | | | | | | | | | | | | | | | | | | rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
| * | | Revert "Use actual time dilation for unqueued updates"Melanie2013-02-121-1/+1
| | | | | | | | | | | | | | | | This reverts commit 048e904f051ccc38e7d00936b45288af3c6fc010.
| * | | 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
| | | | | | | | | | | | | | | | than through the update system.
| * | | 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
| | | | | | | | | | | | | | | | values are not even used.
* | | | Merge branch 'master' into careminsterMelanie2013-02-145-15/+175
|\ \ \ \ | | |/ / | |/| |
| * | | Fix a very unlikely-to-occur NullReferenceException race condition in ↵Justin Clark-Casey (justincc)2013-02-141-2/+7
| | | | | | | | | | | | | | | | llPushObject() where the code assumed that the physics actor it null-checked would still be null when it invoked a method on it
| * | | Adds a couple requested functions to the JsonStore scriptMic Bowman2013-02-134-1/+162
| | | | | | | | | | | | | | | | | | | | | | | | interface. JsonPathType returns the type of node pointed to by the path and deprecates the functionality of both JsonTestPath functions. JsonArrayLength returns the length of an array node.
| * | | Make path parsing more robust in the JsonStore.Mic Bowman2013-02-121-12/+6
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-02-1314-156/+522
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-1314-156/+522
| |\ \ \
| | * | | Add more sub-tests to TestJsonSetValue for paths containing []{} without {} ↵Justin Clark-Casey (justincc)2013-02-131-5/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delineation. As expected, values are not set and the set call returns FALSE (0). As a reminder, these tests are not currently running on jenkins continuous integration as the functionality is only available on .net 4 (mono 2.8 and later).
| | * | | Extend JsonTestSetValue() with tests for escaping brackets, periods and ↵Justin Clark-Casey (justincc)2013-02-131-2/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unbalanced braces from paths The sub-tests that are commented out are currently those which fail unexpectedly based on my understanding of the path syntax
| | * | | 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-1313-141/+304
| | |\ \ \
| | | * | | BulletSim: fix density since the simulator/viewer track density in aRobert Adams2013-02-1211-25/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | funny unit that is 100 times real density (default 1000). Fix avatar drifting slowly when stationary flying. Fix for physical prims getting corrected for being under terrain when it was just its geometric center that was below terrain. Add PreUpdatePropertyAction allowing plugable modifiction of phys parameters returned from Bullet. Fix an exception setting GravityMultiplier on initialization. Update DLLs and SOs for good measure (no functional change).
| | | * | | BulletSim: More work on center-of-mass. Remove linksetinfo and rely on ↵Robert Adams2013-02-128-124/+162
| | | | | | | | | | | | | | | | | | | | | | | | simulator to update info.
| | * | | | Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arraysJustin Clark-Casey (justincc)2013-02-131-13/+57
| | |/ / /
* | | | | Merge branch 'master' into careminsterMelanie2013-02-130-0/+0
|\ \ \ \ \ | |/ / / /
generated by cgit v1.1 at 2024-11-09 19:43:01 +0000