aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-0529-28/+255
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-0528-26/+253
| |\
| | * Fix bug where viewers would not see the "Module command functions not ↵Justin Clark-Casey (justincc)2013-02-051-2/+62
| | | | | | | | | | | | | | | | | | enabled" error if these were disabled and a viewer attempted to call one. This was not working because the shouter was wrongly signalled as an agent rather than a prim
| | * Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-054-1/+168
| | |\
| | | * Added unit tests for Dynamic AttributesOren Hurvitz2013-01-251-0/+37
| | | |
| | | * Disabled DAExampleModuleOren Hurvitz2013-01-251-5/+13
| | | |
| | | * Added DynAttrs to the serialized XML format of prims. When copying prims, ↵Oren Hurvitz2013-01-252-0/+16
| | | | | | | | | | | | | | | | use deep copy for DynAttrs.
| | | * Changed DAMap to be the container of "data stores", which are OSDMaps. Store ↵Oren Hurvitz2013-01-251-12/+13
| | | | | | | | | | | | | | | | names must have at least 4 characters.
| | | * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵Justin Clark-Casey (justincc)2013-01-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
| | | * Add DAExampleModule to demonstrate dynamic attributesJustin Clark-Casey (justincc)2013-01-251-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | This module demonstrates that we can add an arbitrary persisted value to SOP without any changes to core code. Every time the object is moved, the move record is updated and the users in the scene alerted The number of moves is persisted over server restarts in sqlite
| | | * Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLiteJustin Clark-Casey (justincc)2013-01-251-1/+8
| | | |
| | * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-0523-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
| * | | Try to fix uploaded mesh rotations - code from Avination code base.Melanie2013-02-051-12/+27
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-0418-311/+484
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensim/var/git/opensimteravus2013-02-036-28/+54
| |\ \
| | * \ Merge /home/opensim/src/opensimBlueWall2013-02-0123-23/+23
| | |\ \
| | | * | Revert "Update assembly version numbers"BlueWall2013-02-0123-23/+23
| | | | | | | | | | | | | | | | | | | | This reverts commit 141ad829f448b9138b12be7cf99c834c1f3977ec.
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-02-012-18/+33
| | |\ \ \
| | | * | | minor: change comment about assuming script references are textures in ↵Justin Clark-Casey (justincc)2013-02-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | UuidGatherer since this is no longer the behaviour.
| | | * | | Log missing assets on "fcache assets" found. This ignores references found ↵Justin Clark-Casey (justincc)2013-02-022-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by scanning LSL/notecard files since these are the source of false positives. This also changes UuidGatherer to reutn an AssetType.Unknown for embedded script/lsl references instead of Texture, since these are often not textures. This is added to help people in determining when they have missing assets such as textures, etc. In this case, one wants to run "fcache clear" first.
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-02-017-31/+57
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantomJustin Clark-Casey (justincc)2013-02-022-3/+3
| | | | |
| | | * | Stop exceptions being thrown if GenerateMapTiles = false but no static map ↵Justin Clark-Casey (justincc)2013-02-022-7/+18
| | | | | | | | | | | | | | | | | | | | tile has been set. Do more informative warn instead.
| | * | | Update assembly version numbersBlueWall2013-02-0123-23/+23
| | | | |
| * | | | Adds the ability to load more then one IClientNetworkServer thereby allowing ↵teravus2013-02-032-47/+73
| | |/ / | |/| | | | | | | | | | additional client network servers at the same time. Use comma separated values in clientstack_plugin in your config. Additional plugins lying around shouldn't be picked up because the loader only loads configured dll assemblies and breaks at the first IClientNetworkServer found in the assembly. (the only new functionality is the ability to specify more in config). Note: The existing functionality also passes in a nini config.. and has a boolean to determine if the client network server should be initialized for a specific scene.
| * | | Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.teravus2013-02-011-2/+3
| | | |
| * | | BulletSim: fix problem where editting a physical linkset caused theRobert Adams2013-02-012-19/+33
| |/ / | | | | | | | | | | | | child prim physical positions to get out of sync with the view. More reliably compute the offset of children in a physical linkset.
| * | BulletSim: fix crash caused when linksets were rebuilt. A problem addedRobert Adams2013-01-315-80/+106
| | | | | | | | | | | | | | | when individual child pos/rot changes were implementated a week or so ago. Remove some passing of inTaintTime flag when it was never false.
| * | BulletSim: make sure vehicle physical properties are set when goingRobert Adams2013-01-315-46/+35
| | | | | | | | | | | | | | | | | | physical by delaying setting until pre-step time. Change vehicle.Refresh() to schedule the pre-step setting. Comments and updating of TODO list.
| * | BulletSim: clean up TargetVelocity implementation by using the default defn ↵Robert Adams2013-01-312-14/+2
| | | | | | | | | | | | in the PhysicsActor base class.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-01-312-1/+5
| |\ \
| * | | Move the JsonStore regular expressions to static variables to avoidMic Bowman2013-01-312-87/+190
| | | | | | | | | | | | | | | | | | | | recompiling on every operation. Added JsonList2Path script function to simplify array iteration.
* | | | Merge branch 'master' into careminsterMelanie2013-01-311-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Whitespace fix and removing unneccessary parenthesesMelanie2013-01-311-1/+1
| | | |
* | | | Merge branch 'avination' into careminsterMelanie2013-01-312-239/+239
|\ \ \ \
| * | | | Change keyframe motion to use a single timer for all objects. This is requiredMelanie2013-01-301-236/+229
| | | | | | | | | | | | | | | | | | | | | | | | | to prevent slippage between objects that are meant to move synchronously or keep their relative positions/rotations.
| * | | | Change default avatar replacements to be ruth rather than urban maleMelanie2013-01-281-13/+10
| | | | |
| * | | | Send moving_end event to scripts when keyframed motion ends.Melanie2013-01-271-0/+10
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2013-01-313-126/+173
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-01-312-19/+69
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-01-303-0/+25
| | |\ \ \
| | * | | | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵Jak Daniels2013-01-302-19/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | | | Added option for UUID as command parameters. This lets the command handle ↵Dan Lake2013-01-311-0/+4
| | |/ / / | |/| | | | | | | | | | | | | the UUID parsing and type checking before the command is executed.
* | | | | Merge branch 'master' into careminsterMelanie2013-01-3123-166/+974
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | | | Add JsonTestStore to determine if a JsonStore is associated withMic Bowman2013-01-303-0/+25
| |/ / / | | | | | | | | | | | | a particular UUID.
| * | | * This adds a bit more to the previous flying roll effect by adding ↵teravus2013-01-301-10/+50
| | | | | | | | | | | | | | | | additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback.
| * | | * Adds a satisfying angular roll when an avatar is flying and turning. ↵teravus2013-01-302-1/+82
| | | | | | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff.
| * | | Add JsonDestroyStore() basic regression testJustin Clark-Casey (justincc)2013-01-301-0/+15
| | | |
| * | | refactor: Make invocations of json store functions from the regression test ↵Justin Clark-Casey (justincc)2013-01-301-42/+17
| | | | | | | | | | | | | | | | simpler
| * | | Add regression test for script func JsonRemoveValue()Justin Clark-Casey (justincc)2013-01-301-0/+52
| | | |
generated by cgit v1.1 at 2024-12-21 14:10:26 +0000