aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-102-2/+18
|\
| * Fix code to check for no spawn points. Possibly a merge artefact?Melanie2013-02-101-2/+4
| * Fix teleport/telehub issue:BlueWall2013-02-102-3/+17
* | Merge branch 'master' into careminsterMelanie2013-02-081-4/+18
|\ \ | |/
| * If a component of a coalesced object fails to deserialization, do not add a n...Justin Clark-Casey (justincc)2013-02-081-4/+18
* | Merge branch 'master' into careminsterMelanie2013-02-071-0/+20
|\ \ | |/
| * Actually plumb the new values to physics.Melanie2013-02-071-0/+20
| * Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-071-37/+152
| * Plumb the path from the client to the extra physics params and backMelanie2013-02-073-2/+26
| * Revert "Add plumbing for physics properties to get to the physics engine."Melanie2013-02-071-50/+6
| * Add plumbing for physics properties to get to the physics engine.Robert Adams2013-02-071-6/+50
| * Rename "Bounciness" to "Restitution"Melanie2013-02-072-6/+6
* | Merge branch 'avination' into careminsterMelanie2013-02-072-0/+9
|\ \
| * | Rename Bounciness to RestitutionMelanie2013-02-072-6/+6
| * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-062-0/+9
| * | * This adds a bit more to the previous flying roll effect by adding additiona...teravus2013-01-311-10/+50
| * | * Adds a satisfying angular roll when an avatar is flying and turning. (Gene...Melanie2013-01-311-0/+81
* | | Rename Bounciness to RestitutionMelanie2013-02-072-6/+6
* | | Merge branch 'master' into careminsterMelanie2013-02-071-0/+1
|\ \ \ | | |/ | |/|
| * | Enables script access to the per object dynamic attributes through the JsonStoreMic Bowman2013-02-061-0/+1
| * | Partial port of Avination's support for the new physics parameters.Melanie2013-02-062-3/+136
* | | Merge branch 'master' into careminsterMelanie2013-02-064-143/+1
|\ \ \ | |/ /
| * | Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-061-5/+0
| * | Remove very long unused IScriptHost and NullScriptHostJustin Clark-Casey (justincc)2013-02-063-138/+1
* | | Merge branch 'master' into careminsterMelanie2013-02-064-168/+107
|\ \ \ | |/ /
| * | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region....Justin Clark-Casey (justincc)2013-02-063-168/+0
| * | Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would retu...Justin Clark-Casey (justincc)2013-02-061-15/+0
| * | refactor: Move functions that lookup asset ids from task inventory or pass th...Justin Clark-Casey (justincc)2013-02-061-0/+122
* | | Merge branch 'master' into careminsterMelanie2013-02-053-1/+24
|\ \ \ | |/ /
| * | Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-052-1/+24
| |\ \
| | * | Added DynAttrs to the serialized XML format of prims. When copying prims, use...Oren Hurvitz2013-01-252-0/+16
| | * | Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting fr...Justin Clark-Casey (justincc)2013-01-251-2/+2
| | * | 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-051-1/+1
* | | | Merge branch 'master' into careminsterMelanie2013-02-042-5/+10
|\ \ \ \ | |/ / /
| * | | minor: change comment about assuming script references are textures in UuidGa...Justin Clark-Casey (justincc)2013-02-021-1/+2
| * | | Log missing assets on "fcache assets" found. This ignores references found b...Justin Clark-Casey (justincc)2013-02-021-2/+5
| * | | Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.teravus2013-02-011-2/+3
* | | | 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-311-226/+229
|\ \ \ \ | | |_|/ | |/| |
| * | | Change keyframe motion to use a single timer for all objects. This is requiredMelanie2013-01-301-236/+229
| * | | Send moving_end event to scripts when keyframed motion ends.Melanie2013-01-271-0/+10
* | | | Merge branch 'master' into careminsterMelanie2013-01-311-108/+106
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-01-301-0/+1
| |\ \ \
| * | | | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ...Jak Daniels2013-01-301-1/+6
* | | | | Merge branch 'master' into careminsterMelanie2013-01-312-0/+122
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add JsonTestStore to determine if a JsonStore is associated withMic Bowman2013-01-301-0/+1
| |/ / /
| * | | * This adds a bit more to the previous flying roll effect by adding additiona...teravus2013-01-301-10/+50
| * | | * Adds a satisfying angular roll when an avatar is flying and turning. (Gene...teravus2013-01-301-0/+81
generated by cgit v1.1 at 2024-10-23 23:28:01 +0000