aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-186-24/+43
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-01-174-21/+6
| |\
| * | BulletSim: Add one function that all actors who act on the physicalRobert Adams2013-01-175-24/+31
| | | | | | | | | | | | | | | can use to know if the object is currently active. Code cleaning including use of Util.ClampV function.
| * | Add utility function to clamp a vector to a maximum magnitude.Robert Adams2013-01-171-0/+12
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-1611-63/+243
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-01-1636-161/+839
| |\ \
| | * | Changed a couple of debug messages at the request of osgrid.Diva Canto2013-01-161-2/+2
| | |/
| | * BulletSim: add the editting children in linkset going phantom bug to TODO list.Robert Adams2013-01-151-0/+2
| | |
| | * BulletSim: don't modify angular parameters when doing LIMIT_MOTOR_UP.Robert Adams2013-01-155-28/+30
| | | | | | | | | | | | | | | It was a dumb idea to try and do a nose over feature for jumping cars anyway. Add better logging of native shape creation/reuse so can tell the difference.
| | * BulletSim: add debugging messages to know when assets for physicalRobert Adams2013-01-154-17/+51
| | | | | | | | | | | | | | | objects have been fetched. Update TODO list with more work.
| | * BulletSim: reduce maximum force a script can apply (like in llApplyImpulse)Robert Adams2013-01-151-3/+3
| | | | | | | | | | | | to the documented maximum from the outragious number previously.
| | * Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-1619-55/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented. This commit, unlike 1b5c41c, passes the wait handle as an extra parameter through IScript.Initialize() instead of passing IScriptInstance itself.
| | * Revert "Implement co-operative script termination if termination comes ↵Justin Clark-Casey (justincc)2013-01-168-293/+14
| | | | | | | | | | | | | | | | | | | | | | | | during a script wait event (llSleep(), etc.)" Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api. This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
| * | Complete removal of the now unused state queueMelanie2013-01-163-19/+4
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-163-6/+39
|\ \ \
| * | | Add admin_refresh_search command to RemoteAdminMelanie2013-01-161-0/+29
| | | |
| * | | Add Refresh() Method to ISerachModule to allow forcing a sim to resend it'sMelanie2013-01-151-1/+1
| | | | | | | | | | | | | | | | search data
| * | | Fix llSetRegionPos and detail behaviors of llSet[Link]PrimitiveParams[Fast]()Melanie2013-01-151-5/+9
| | | | | | | | | | | | | | | | regarding prim positioning.
* | | | JustinCC's core re-mergeMelanie2013-01-1619-92/+236
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-01-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-1613-40/+373
| |\ \ \
| * | | | Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-168-14/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
| * | | | Instead of passing separate engine, part and item components to script APIs, ↵Justin Clark-Casey (justincc)2013-01-1516-79/+110
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | pass down IScriptInstance instead. This is to allow the future co-operative script thread terminate feature to detect and act upon termination requests. This splits the assembly and state loading out from the ScriptInstance() constructor to a separate Load() method in order to facilititate continued script logic regression testing.
* | | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-1618-60/+414
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-1535-344/+663
| |\ \ \
| | * | | BulletSim: tweeks to improve hover.Robert Adams2013-01-151-5/+21
| | | | |
| | * | | BulletSim: temporarily disable banking and direction deflectionRobert Adams2013-01-152-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | because the computations are wrong. Add VehicleTorqueImpulse routines.
| | * | | BulletSim: fix logic for enabling unmanaged code debug messages.Robert Adams2013-01-151-1/+14
| | | | | | | | | | | | | | | | | | | | Free pinned memory when physics engine is unloaded.
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensimRobert Adams2013-01-153-13/+8
| | |\ \ \
| | | * | | move resit fix to ScenePresence.cs and allow for requesting sit on objects ↵dahlia2013-01-142-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | other than the object currently sat on
| | | * | | test commit for new git installdahlia2013-01-141-1/+1
| | | |/ /
| | * | | BulletSim: by default, turn on continuious collision detection (CCD)Robert Adams2013-01-152-11/+3
| | |/ / | | | | | | | | | | | | | | | | and enable friction computation caching. Remove dangerous BulletSim settings from OpenSimDefaults.ini.
| | * | Print full stacktrace from plugin loading failure to help determine what ↵Justin Clark-Casey (justincc)2013-01-151-2/+5
| | | | | | | | | | | | | | | | went wrong, rather than a possibly unhelpful simple exception message.
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-1530-246/+554
| | |\ \
| | | * | BulletSim: fix not moving physical objects below terrain to over terrain.Robert Adams2013-01-145-18/+36
| | | | | | | | | | | | | | | | | | | | | | | | | Add locking on register prestep action list preventing potential race conditions. Little comment and formatting changes.
| * | | | Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-155-0/+298
| | | | | | | | | | | | | | | | | | | | | | | | | Added registration json-rpc handlers in the http server. Covers version 2.0 See: http://www.jsonrpc.org/specification
* | | | | Merge commit '7978b349bd400d14b7ecd4f8274af1921f435fee' into careminsterMelanie2013-01-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart ↵Justin Clark-Casey (justincc)2013-01-141-72/+55
| | | | | | | | | | | | | | | | | | | | instead of sometimes but not always looking it up.
* | | | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-1629-227/+507
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | | | BulletSim: disable center-of-mass computation for linksets until debugged. ↵Robert Adams2013-01-142-25/+36
| | | | | | | | | | | | | | | | | | | | Move physical prim above ground if it is underground. Previously tried to correct by applying and up force but the prim would never go through the ground.
| * | | | BulletSim: move center of gravity of linkset to its geometric center.Robert Adams2013-01-1114-32/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Necessitated allowing simulator and physical position of a body to get out of sync since Bullet assumes that <0,0,0> is the center of mass. Update DLLs and SOs for the UpdateChildTransform so positions of individual prim in a linkset can be implemented.
| * | | | BulletSim: add osGetPhysicsEngineType() LSL function and updateRobert Adams2013-01-1112-22/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the physics engines to return the name that is specified in the INI file ("physics = XXX") as the type of engine. This os function is a little different than the others in that it does not throw an exception of one is not privilaged to use it. It merely returns an empty string.
| * | | | BulletSim: Add IsSelected attribute to physical objects. Have vehicles check ↵Robert Adams2013-01-114-50/+162
| | | | | | | | | | | | | | | | | | | | to see if physical before trying to step. Replace vehicle gravity application. Previously relying on Bullet to apply gravity but since vehicles over-ride the velocity calculation, gravity never had a chance to accelerate the body down. Added AddForceImpulse as well as AddForce for those who need to apply immediate velocity updates. Use the impulse to apply the linear motion.
| * | | | Fix exception reporting in SceneObjectPart so it logs what the exception is ↵Robert Adams2013-01-111-2/+2
| | | | | | | | | | | | | | | | | | | | rather than just saying it happened.
| * | | | BulletSim: Redo linear function coding so they can better interact. New ↵Robert Adams2013-01-112-62/+91
| | | | | | | | | | | | | | | | | | | | algorithm for limitMotorUp that relies on going up when not colliding rather than distance from ground. Add parameter for turning on and off embedded source vehicle debugging.
| * | | | BulletSim: remove double application of buoyancy. Centralize computation of ↵Robert Adams2013-01-114-65/+59
| | |/ / | |/| | | | | | | | | | buoyancy. Add motor angular debugging controls.
* | | | Merge branch 'avination' into careminsterMelanie2013-01-134-32/+42
|\ \ \ \ | | |_|/ | |/| |
| * | | add some sanity checking to HandleAgentRequestSit handlerdahlia2013-01-131-2/+12
| | | |
| * | | Merge branch 'ubitwork' into avinationMelanie2013-01-114-32/+42
| |\ \ \
| | * | | make sure keyframe rotations are normalizedUbitUmarov2013-01-111-1/+3
| | | | |
generated by cgit v1.1 at 2024-10-23 23:31:45 +0000