Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵ | Diva Canto | 2013-02-21 | 16 | -67/+153 | |
| |/ / | | | | | | | | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency. | |||||
| * | | BulletSim: add OutOfBounds logic and some position sanity checking | Robert Adams | 2013-02-21 | 5 | -33/+68 | |
| | | | | | | | | | | | | to eliminate some of the "cannot find terrain height" warning messages. | |||||
| * | | Add a method to IStatsCollector for returning stats as an OSDMap. | Robert Adams | 2013-02-20 | 6 | -4/+82 | |
| | | | | | | | | | | | | | | | | | | Extend implementors of IStatsCollector to return an OSDMap of stats. Update UserStatsCollector and AssetStatsCollector to return both string and OSDMap data (as well as console format). | |||||
| * | | Add flush after write feature to LogWriter | Robert Adams | 2013-02-20 | 1 | -1/+12 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-20 | 61 | -155/+58 | |
| |\ \ | ||||||
| | * | | Fix the JsonStore path set problem justincc found earlier today and | Mic Bowman | 2013-02-19 | 4 | -96/+3 | |
| | | | | | | | | | | | | | | | | remove the deprecated TestPath functions. | |||||
| | * | | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 55 | -55/+53 | |
| | | | | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-19 | 6 | -18/+39 | |
| | |\ \ | ||||||
| | * | | | Updated AssemblyInfo.cs for Groups and OfflineIM to 0.7.6.*. Removed ↵ | Diva Canto | 2013-02-19 | 2 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | AssemblyFileVersionNumber too. | |||||
| * | | | | Correct mistake in parsing 'show object pos' and similar pos commands where ↵ | Justin Clark-Casey (justincc) | 2013-02-20 | 2 | -9/+9 | |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | the 'to' text would be treat as the end vector rather than discarded. Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors | |||||
| * | | | Give the user some feedback about the success or failure of console login ↵ | Justin Clark-Casey (justincc) | 2013-02-20 | 1 | -2/+13 | |
| | | | | | | | | | | | | | | | | property commands | |||||
| * | | | Add information about MinLoginLevel to example ini files | Justin Clark-Casey (justincc) | 2013-02-20 | 2 | -1/+11 | |
| | | | | ||||||
| * | | | minor: remove some mono compiler warnings in ↵ | Justin Clark-Casey (justincc) | 2013-02-20 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | OpenSim.Region.ClientStack.Linden.Caps.dll | |||||
| * | | | Convert JsonTestPath() use in json regression tests to JsonGetPathType() instead | Justin Clark-Casey (justincc) | 2013-02-19 | 1 | -10/+10 | |
| |/ / | ||||||
| * | | This should fix the build fail. Fingers crossed. | Diva Canto | 2013-02-19 | 1 | -1/+1 | |
| | | | ||||||
| * | | Previous build failed. Checking in a dummy change to see if the fail persists. | Diva Canto | 2013-02-19 | 1 | -3/+3 | |
| | | | ||||||
| * | | First commit of Diva Groups. The Data bits went to OpenSim.Data core, the ↵ | Diva Canto | 2013-02-19 | 24 | -15/+9544 | |
| | | | | | | | | | | | | rest to Addons.Groups.dll. | |||||
| * | | Offline IM: moved the Data and MySQL bits to the corresponding places in ↵ | Diva Canto | 2013-02-19 | 6 | -13/+5 | |
| | | | | | | | | | | | | core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that. | |||||
| * | | One more sql statement on migration #2 for offline im, to really clean up ↵ | Diva Canto | 2013-02-18 | 1 | -0/+1 | |
| | | | | | | | | | | | | things. | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-18 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | minor: Rename regression test method TestGetArrayLength() -> ↵ | Justin Clark-Casey (justincc) | 2013-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | JsonTestGetArrayLength() to match others | |||||
| * | | | Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll | Diva Canto | 2013-02-18 | 13 | -15/+1088 | |
| | | | | ||||||
| * | | | I need these for OfflineIM and Groups. | Diva Canto | 2013-02-18 | 1 | -0/+60 | |
| |/ / | ||||||
| * | | BulletSim: experimental lock axis code using constraints. Not enabled | Robert Adams | 2013-02-17 | 2 | -22/+74 | |
| | | | | | | | | | | | | by default. Like more debugging is needed. | |||||
| * | | BulletSim: add calls for creating all the different Bullet constraint types. | Robert Adams | 2013-02-17 | 9 | -47/+338 | |
| | | | | | | | | | | | | | | | Updated the DLLs and SOs and code for BulletXNA to create the types. All the detailed control calls are not all in place yet. | |||||
| * | | BulletSim: rework parameter setting for different types of values | Robert Adams | 2013-02-17 | 5 | -394/+348 | |
| | | | | | | | | | | | | (like vectors or quaternions). | |||||
| * | | * Fix walking to <NaN, NaN, NaN> via autopilot. | teravus | 2013-02-16 | 1 | -1/+5 | |
| | | | ||||||
| * | | BulletSim: fix physical object appearing to slowly float off when | Robert Adams | 2013-02-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | they stop moving. | |||||
| * | | Fix shape parameters sent for meshes tosupport the full number of faces | Melanie | 2013-02-16 | 1 | -0/+8 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-16 | 12 | -298/+533 | |
|\ \ \ | |/ / | ||||||
| * | | Separate IAR tests into separate files for load/save/loadpath tests | Justin Clark-Casey (justincc) | 2013-02-16 | 3 | -245/+198 | |
| | | | ||||||
| * | | Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder. | Justin Clark-Casey (justincc) | 2013-02-16 | 2 | -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/opensim | Justin Clark-Casey (justincc) | 2013-02-16 | 2 | -22/+22 | |
| |\ \ | ||||||
| * | | | Add regression test TestSaveNonRootFolderToIar | Justin Clark-Casey (justincc) | 2013-02-16 | 11 | -54/+277 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2013-02-15 | 13 | -103/+267 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2013-02-14 | 32 | -242/+983 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Enable one sub-test in TestJsonSetValue() which now works (using identifier ↵ | Justin Clark-Casey (justincc) | 2013-02-15 | 1 | -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-15 | 2 | -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-15 | 1 | -62/+62 | |
| | | | | | | | | | | | | | | | | will go away soon | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-15 | 3 | -7/+11 | |
| | |\ \ | ||||||
| | | * | | * Handle null check on configs in module startup so that the the code can be ↵ | teravus | 2013-02-14 | 2 | -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 ↵ | teravus | 2013-02-14 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | WebSocket handler | |||||
| | * | | | Add regression TestJsonList2Path() | Justin Clark-Casey (justincc) | 2013-02-15 | 1 | -2/+27 | |
| | |/ / | ||||||
| | * | | Add regression TestGetArrayLength() | Justin Clark-Casey (justincc) | 2013-02-14 | 1 | -0/+33 | |
| | | | | ||||||
| | * | | Add regression TestJsonGetPathType() | Justin Clark-Casey (justincc) | 2013-02-14 | 1 | -0/+47 | |
| | | | | ||||||
| | * | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2013-02-14 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵ | Justin Clark-Casey (justincc) | 2013-02-14 | 3 | -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-14 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | consistent with existing LSL/OSSL, etc script constants. Agreed with cmickeyb | |||||
| | * | | Add EventManager events triggered when a SOP is added or removed | Robert Adams | 2013-02-14 | 2 | -0/+57 | |
| | | | | | | | | | | | | | | | | from the physical scene. Invocations added in SceneObjectPart. | |||||
| * | | | Use SortedDictionary in StatsManager instead of regular Dictionary so stats ↵ | Dan Lake | 2013-02-14 | 2 | -22/+22 | |
| | | | | | | | | | | | | | | | | will interate and print in a defined order |