| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -0/+20 |
| |\ | |||||
| | * | Actually plumb the new values to physics. | Melanie | 2013-02-07 | 1 | -0/+20 |
| | | | |||||
| | * | Add some more code from Avination. This changes physics actor stuff around | Melanie | 2013-02-07 | 1 | -37/+152 |
| | | | | | | | | | to work with the new params. Not actually plumbed just yet. | ||||
| | * | Plumb the path from the client to the extra physics params and back | Melanie | 2013-02-07 | 1 | -0/+1 |
| | | | |||||
| | * | Revert "Add plumbing for physics properties to get to the physics engine." | Melanie | 2013-02-07 | 1 | -50/+6 |
| | | | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a. | ||||
| | * | Add plumbing for physics properties to get to the physics engine. | Robert Adams | 2013-02-07 | 1 | -6/+50 |
| | | | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart. | ||||
| | * | Rename "Bounciness" to "Restitution" | Melanie | 2013-02-07 | 1 | -3/+3 |
| | | | |||||
| | * | Partial port of Avination's support for the new physics parameters. | Melanie | 2013-02-06 | 1 | -3/+93 |
| | | | | | | | | | | | | | | | | | Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset. | ||||
| * | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Remove very long unused IScriptHost and NullScriptHost | Justin Clark-Casey (justincc) | 2013-02-06 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -0/+9 |
| |\ \ | |/ | | | | | | | | | | | | | 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 | ||||
| | * | Added DynAttrs to the serialized XML format of prims. When copying prims, ↵ | Oren Hurvitz | 2013-01-25 | 1 | -0/+2 |
| | | | | | | | | | use deep copy for DynAttrs. | ||||
| | * | Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵ | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual | ||||
| | * | Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLite | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -1/+8 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-01-25 | 1 | -0/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | ||||
| | * | * This makes the non-physics llCastRay 'better'. It's not 'correctly ↵ | teravus | 2013-01-23 | 1 | -0/+1 |
| | | | | | | | | | working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray. | ||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2013-01-23 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | careminster | ||||
| | * \ | Merge branch 'avination' | Melanie | 2013-01-19 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs | ||||
| | | * | | dont send a full grp update on stopmovetotarget. just a rootpart terse | UbitUmarov | 2013-01-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-01-23 | 1 | -12/+0 |
| |\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs | ||||
| | * | | Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenter | Robert Adams | 2013-01-21 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | routines on the physics engine. Won't make a difference for any existing scripts since ODE always returned Vector3.Zero. | ||||
| * | | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster | Melanie | 2013-01-16 | 1 | -3/+3 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | | Fix exception reporting in SceneObjectPart so it logs what the exception is ↵ | Robert Adams | 2013-01-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | rather than just saying it happened. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-01-13 | 1 | -9/+18 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | update the last information sent in terse updates where they are sent to all | UbitUmarov | 2013-01-11 | 1 | -10/+19 |
| | | | | | | | | | | | | | clients and not only on Scheduled sends | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-01-10 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | Change IsRoot to use ReferenceEquals to prevent operator == messiness | Melanie | 2013-01-09 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 1 | -40/+39 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | Fix llGetLinkKey() to return the last sat avatar as the last link number. | Justin Clark-Casey (justincc) | 2013-01-04 | 1 | -40/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | As per http://wiki.secondlife.com/wiki/LlGetLinkKey This is done by keeping a scene-object wide list of sitters. This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim. This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists Addresses http://opensimulator.org/mantis/view.php?id=6477 | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-12-21 | 1 | -6/+6 |
| |\ \ \ | |/ / | |||||
| | * | | Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. ↵ | Robert Adams | 2012-12-18 | 1 | -6/+6 |
| | | | | | | | | | | | | | Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-12-16 | 1 | -3/+6 |
| |\ \ \ | |/ / | | / | |/ |/| | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | ||||
| | * | minor: If the physics module tells us that an object has gone out of bounds, ↵ | Justin Clark-Casey (justincc) | 2012-12-15 | 1 | -2/+5 |
| | | | | | | | | | more helpfully log the name, id, position and region of that object. | ||||
| | * | Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, ↵ | Justin Clark-Casey (justincc) | 2012-12-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | causing subsequent issues if physics was re-enabled. Added regression tests Addresses http://opensimulator.org/mantis/view.php?id=6365 | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-11-04 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Make sure we're not accessing a physics scene if we're not in one yet. | Melanie | 2012-10-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Put back the collision sound shim into SOP | Melanie | 2012-10-30 | 1 | -0/+29 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-30 | 1 | -152/+0 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | shuffling code around so that the interface for ISoundModule.SendSound() ↵ | SignpostMarv | 2012-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | specifies a UUID rather than a string | ||||
| | * | | moving SendSound from SceneObjectPart to ISoundModule | SignpostMarv | 2012-10-29 | 1 | -79/+9 |
| | | | | |||||
| | * | | fixing a bug in SceneObjectPart.SendSound where sounds would always come ↵ | SignpostMarv | 2012-10-29 | 1 | -9/+8 |
| | | | | | | | | | | | | | from the root prim rather than the source prim | ||||
| | * | | Factoring out a superfluous local variable & repeated assignment in ↵ | SignpostMarv | 2012-10-29 | 1 | -10/+8 |
| | | | | | | | | | | | | | SceneObjectPart.SendSound as linksets are only meant to have a single owner | ||||
| | * | | removing superfluous lines from SceneObjectPart.SendSound | SignpostMarv | 2012-10-29 | 1 | -8/+0 |
| | | | | |||||
| | * | | transposing preload sound onto sound module | SignpostMarv | 2012-10-29 | 1 | -31/+0 |
| | | | | |||||
| | * | | formatting changes to SceneObjectPart.SendSound; consistent indentation | SignpostMarv | 2012-10-29 | 1 | -34/+34 |
| | | | | |||||
| | * | | SceneObjectPart.SendSound can exit early if a sound module was not found. | SignpostMarv | 2012-10-29 | 1 | -4/+4 |
| | | | | |||||
| | * | | Changing the logic order in the TaskInventory iterator of ↵ | SignpostMarv | 2012-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | ScenObjectPart.SendSound, since we can currently have non-unique object inventory names so we should check the asset type first. | ||||
| | * | | Replacing double-if block in SceneObjectPart.SendSound with Util.Clip | SignpostMarv | 2012-10-29 | 1 | -4/+1 |
| | | | | |||||
| | * | | normalize quaternion.Slerp outputs | UbitUmarov | 2012-10-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |