aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so ↵Justin Clark-Casey (justincc)2013-01-262-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that these can be triggered by future code (not yet implemented). Also hooks up moving_start and moving_end script events, eliminating itemID on XEngine EventManager methods since this is completely unused. An adaptation of the patch in http://opensimulator.org/mantis/view.php?id=6515 Thanks Garmin Kawaguichi and Signpost Marv.
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-261-86/+116
| |\ \ \ \
| * | | | | Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParamsTalun2013-01-261-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | Correction so that scripts can turn Flexi off as well as on.
* | | | | | Merge branch 'master' into careminsterMelanie2013-01-268-119/+307
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | * This adds llVolumeDetect functionality to the C# implementation of BulletSim.teravus2013-01-251-86/+116
| |/ / / /
| * | | | minor: Fix full scene part console report to show proper Light* names rather ↵Justin Clark-Casey (justincc)2013-01-261-5/+5
| | | | | | | | | | | | | | | | | | | | than all wrongly FlexiDrag
| * | | | minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to ↵Justin Clark-Casey (justincc)2013-01-261-0/+2
| | |_|/ | |/| | | | | | | | | | disable any enabled logging from previous tests
| * | | Disable json tests for now - I see this is failing on jenkins because mono ↵Justin Clark-Casey (justincc)2013-01-252-32/+29
| | | | | | | | | | | | | | | | | | | | | | | | 2.4.3 doesn't have Funcs >5 params, though mono 2.6 onwards does. Standardize logging in JsonStoreScriptModule and some minor code formatting.
| * | | See if getting the registering JsonReadNotecard with MethodInfo works around ↵Justin Clark-Casey (justincc)2013-01-251-2/+5
| | | | | | | | | | | | | | | | an apparent issue with registering methods with more than 5 parameters on mono 2.4.3
| * | | Increase logging by enabling during test setup rather than during individual ↵Justin Clark-Casey (justincc)2013-01-251-4/+6
| | | | | | | | | | | | | | | | tests of for JsonStore
| * | | Enable logging in new json store tests to find out why they fail on jenkins ↵Justin Clark-Casey (justincc)2013-01-251-4/+4
| | | | | | | | | | | | | | | | but not locally.
| * | | Add JsonTestPath() regression testJustin Clark-Casey (justincc)2013-01-251-0/+17
| | | |
| * | | Add regression test for JsonSetValue()Justin Clark-Casey (justincc)2013-01-251-0/+23
| | | |
| * | | minor: remove mono compiler warning in SceneCommandsModuleJustin Clark-Casey (justincc)2013-01-251-1/+1
| | | |
| * | | Add basic JsonGetValue() regression test.Justin Clark-Casey (justincc)2013-01-251-0/+17
| | | |
| * | | Add basic JsonCreateStore() regression testJustin Clark-Casey (justincc)2013-01-252-1/+87
| | | |
| * | | BulletSim: reduce the force of gravity on ground vehicles when theyRobert Adams2013-01-241-0/+11
| | | | | | | | | | | | | | | | are on the ground. Makes them a little more stable.
* | | | Merge branch 'master' into careminsterMelanie2013-01-2519-191/+670
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | | BulletSim: reduce the zeroing threshold for rotational velocity.Robert Adams2013-01-241-3/+1
| | | | | | | | | | | | | | | | | | | | Sometimes settling of a vehicle from gravity introduces small velocities that need to be kept.
| * | | BulletSim: disable CCD (continuious collision detection) andRobert Adams2013-01-241-3/+3
| | | | | | | | | | | | | | | | | | | | contact processing threshold since the first didn't solve tunneling problems but used resources and the latter caused instabilities.
| * | | BulletSim: zero motion on an object that we pop up because it isRobert Adams2013-01-241-1/+7
| | | | | | | | | | | | | | | | | | | | below terrain. If the position is being corrected because it is out of bounds, all other movement rules are out the window.
| * | | BulletSim: remove exception that can happen when setting physics parameters ↵Robert Adams2013-01-241-2/+2
| | | | | | | | | | | | | | | | from the console.
| * | | Mantis 6508 llHTTPResponse body is incorrectly interpreted by IETalun2013-01-241-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch html escapes responses going to IE so that they cannot be interpreted as HTML if the response type is "text/plain". This has no effect if the reponse type has been set to "text/html" by osSetContentType Signed-off-by: nebadon <michael@osgrid.org>
| * | | Add JSONification of WebStats module. Adds a '?json' query parameterRobert Adams2013-01-2410-11/+281
| | | | | | | | | | | | | | | | | | | | | | | | to the fetch URL to return the data in JSON format. Also adds a simple 'sim.html' that uses JavaScript to display the JSON data. Not pretty but an example.
| * | | * Added in the manifold point dept on collision desc. In BulletSim engine ↵teravus2013-01-241-5/+64
| | | | | | | | | | | | | | | | BulletXNA.
| * | | * Repairs the Object updates, Collision updates, and Child Prim methods ↵teravus2013-01-241-164/+282
| | | | | | | | | | | | | | | | | | | | | | | | making the bulletXNA engine work again. * The only thing that had an issue was when creating a new RigidBody, BulletXNA didn't know the type SimMotionState and the upcast type is unknown in the constructor. Therefore, I had to update the IMotionState with a new method 'SetBody'. All of the duplicated type information has been removed and BulletXNA is not relying on any non-standard types external to the library.
| * | | * This makes the non-physics llCastRay 'better'. It's not 'correctly ↵teravus2013-01-232-4/+18
| | | | | | | | | | | | | | | | working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray.
| * | | Remove unnecessary System.Linq reference from Compiler.csJustin Clark-Casey (justincc)2013-01-241-1/+0
| | | | | | | | | | | | | | | | Hopefully will fix windows build via compile.bat
* | | | Merge branch 'avination' into careminsterMelanie2013-01-247-16/+36
|\ \ \ \ | | |/ / | |/| |
| * | | Make llGiveMoney async again. The return value is now the constant 1 to makeMelanie2013-01-241-8/+10
| | | | | | | | | | | | | | | | | | | | scripts work properly. Scripts will no longer receive a failure indication through this return value;
| * | | Reintroduce the return value of llGiveMoney. The grid will crash and burn ↵Melanie2013-01-243-12/+12
| | | | | | | | | | | | | | | | without it.
| * | | Null check the response body to make sure we're not crashing the script engineMelanie2013-01-241-0/+6
| | | |
| * | | Prevent double ground collisions and prefer the physics result if there is one.Melanie2013-01-231-3/+15
| | | | | | | | | | | | | | | | | | | | ODE is known to not see the ground sometimes on raycast so the double test is needed.
| * | | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-234-12/+12
| | | | | | | | | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
* | | | Merge branch 'master' into careminsterMelanie2013-01-244-4/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Disable the not very useful infinite recursion co-op termination tests for ↵Justin Clark-Casey (justincc)2013-01-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | now as they appear to cause failures with testing in jenkins. These tests are not very useful anyway as they never actually get a chance to try termination before the script runs out of stack
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-242-2/+4
| |\ \ \
| | * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-01-2314-131/+604
| | |\ \ \
| | * | | | BulletSim: pass up and report the real collision penetration.Robert Adams2013-01-232-2/+4
| | | | | |
| * | | | | Fix mono 2.4.3 build break by using CreateInstanceAndUnwrap 9 method call ↵Justin Clark-Casey (justincc)2013-01-241-0/+1
| | |/ / / | |/| | | | | | | | | | | | | deprecated in later .net versions
* | | | | Merge branch 'master' into careminsterMelanie2013-01-2424-245/+688
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | | | Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-2454-12696/+1815
| |\ \ \ \ | | |/ / /
| | * | | BulletSim: remove setting of vehicle InterpolationRotationalVelocity.Robert Adams2013-01-232-36/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't seem to help the vehicle stability. Rename vehicle internal variables adding a "V" or "W" so it is clear when coordinates are vehicle or world relative.
| | * | | BulletSim: small change to center-of-mass computation left out last commitRobert Adams2013-01-231-3/+8
| | | | |
| | * | | BulletSim: center-of-gravity linkset changes. Not working yet.Robert Adams2013-01-234-29/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
| | * | | BulletSim: working on COMRobert Adams2013-01-234-7/+36
| | | | |
| | * | | BulletSim: fix build break introduced by previous commitRobert Adams2013-01-231-5/+0
| | | | |
| | * | | BulletSim: remove the unused RestoreBodyDependencies used by linksetsRobert Adams2013-01-233-33/+2
| | | | | | | | | | | | | | | | | | | | and vehicles and clean up code by removing their kludgyness.
| | * | | Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-233-13/+129
| | | | |
| | * | | Remove the return value from llGiveMoney and add llTransferLindenDollars. AlsoMelanie2013-01-233-33/+114
| | | | | | | | | | | | | | | | | | | | | | | | | make llGiveMoney async so the script thread is not held up waiting for comms to an external server.