aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-2350-12555/+1330
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| * BulletSim: Tweeks to vehicle motion.Robert Adams2013-01-213-15/+11
| | | | | | | | | | Pass through old angular velocity making for smoother transitions. Remove some old kludges for angular motion (damping and rotvel suppression).
| * BulletSim: allow changing position and rotation of a child of a linksetRobert Adams2013-01-218-46/+112
| | | | | | | | | | without rebuilding the whole compound shape. Should make vehicles move smoother.
| * Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenterRobert Adams2013-01-212-1/+11
| | | | | | | | | | routines on the physics engine. Won't make a difference for any existing scripts since ODE always returned Vector3.Zero.
| * BulletSim: remove unused MaxTaintsToProcessPerStep parameterRobert Adams2013-01-213-8/+5
| |
| * BulletSim: More aggressive as setting character velocity to zeroRobert Adams2013-01-205-91/+153
| | | | | | | | | | | | | | | | | | | | | | | | when should be standing. Modify angular force routines to be the same pattern as linear force routines. BulletSim vehicle turning is scaled like SL and is DIFFERENT THAN ODE!! Fix some bugs in BSMotor dealing with the motor going to zero. Add a bunch of parameters: MaxLinearVelocity, MaxAngularVelocity, MaxAddForceMagnitude, VehicleMaxLinearVelocity, VehicleMaxAngularVelocity, and most of the values are defaulted to values that are larger than in SL. Use the new parameters in BSPrim, BSCharacter and BSDynamic.
| * BulletSim: fix problem of avatar sliding very slowly occasionally after ↵Robert Adams2013-01-201-34/+41
| | | | | | | | stopping walking. Consolidate movement tests into the one prestep motion action
| * BulletSim: small fix making sure terrain height is calculatedRobert Adams2013-01-201-1/+3
| | | | | | | | properly if the vehicle moves during vehicle actions.
| * BulletSim: modify motors to return correction rather than current valueRobert Adams2013-01-205-38/+36
| | | | | | | | | | | | | | to better use them for incremental updates. Modify prim and character to use the new motors. Simplify the vehicle linear movement code to just update the velocity directly or the basic movement.
| * This updates prebuild to remove BulletSimN, implements the BulletSim API in ↵teravus2013-01-205-296/+637
| | | | | | | | BulletSPlugin using the BulletXNA Bullet physics engine. It also updates the BulletXNA library to be compatible with the changes. OpenSimDefaults has been updated to describe how to switch engines and terrain implementations.
| * * Dumping BulletSimNPlugin in favor of combining the APIteravus2013-01-2023-11752/+0
| |
| * * Tweak the BulletSimN API a bit.teravus2013-01-202-17/+18
| |
| * * Allow unsafe code with BulletSimteravus2013-01-201-0/+2
| |
| * IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in ↵PixelTomsen2013-01-195-273/+316
| | | | | | | | | | | | | | | | OpenSimDefaults.ini / section [IRC] http://opensimulator.org/mantis/view.php?id=6470 idea: https://github.com/ssm2017/IrcBridgeAlert
| * minor: adjust formatting in TESTING.txt to make headers more wiki-likeJustin Clark-Casey (justincc)2013-01-191-5/+5
| |
| * Check the existing ScenePresence.ParentPart to make sure we're not trying to ↵Justin Clark-Casey (justincc)2013-01-191-2/+1
| | | | | | | | | | | | | | sit on a prim we're already sat upon, rather than looking up the part from scratch. An adaptation of commit 055b8a2 Having both ParentID and ParentPart references now is redundant. ParentID should probably be eliminated.
| * Assign the SmartThreadPool name in the constructorOren Hurvitz2013-01-194-5/+30
| | | | | | | | This is required because some threads are created in the constructor, so assigning the name afterwards would be too late.
* | Merge branch 'master' into careminsterMelanie2013-01-1914-55/+226
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * Explicitly stop PollServiceRequestManager() rather than relying on its ↵Justin Clark-Casey (justincc)2013-01-192-5/+15
| | | | | | | | | | | | destructor. Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
| * New constants for llGetObjectDetailsTalun2013-01-192-0/+92
| | | | | | | | | | | | | | New constants for llGetObjectDetails OBJECT_CHARACTER_TIME, OBJECT_ROOT, OBJECT_ATTACHED_POINT, OBJECT_PATHFINDING_TYPE, OBJECT_PHYSICS, OBJECT_PHANTOM and OBJECT_TEMP_ON_REZ also Pathfining constants, 3 of which are used by llGetObjectDetails
| * Mantis 6507 keys returned by llGetAgentList incorrect for llList2KeyTalun2013-01-191-2/+2
| | | | | | | | The type of the keys returned by llGetAgentList corrected to LSL_Key
| * Fix use of scene debug commands when region is set to root or a specific ↵Justin Clark-Casey (justincc)2013-01-191-15/+12
| | | | | | | | region where there is more than one region on the simulator.
| * Add "debug set set animations true|false" region console command.Justin Clark-Casey (justincc)2013-01-184-24/+48
| | | | | | | | | | Setting this logs extra information about animation add/remove, such as uuid and animation name Unfortunately cannot be done per client yet
| * Restore previous client AO behaviour by not allowing them to remove the ↵Justin Clark-Casey (justincc)2013-01-185-8/+27
| | | | | | | | | | | | | | | | | | default animation but continue to allow scripts to do so. This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327 and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483 Animations may still exhibit different behaviour if both scripts and clients are adjusting animations. A change in the behaviour of client AO to not remove all animations may be a better long term approach.
| * BulletSim: reduce jitter in avatar velocity when walking or flying.Robert Adams2013-01-182-2/+9
| | | | | | | | | | | | | | OpenSimulator is VERY sensitive to changes in avatar velocity and will send an avatar update message when velocity changes more than 0.001m/s. This significantly reduces the number of avatar update messages by smoothing the avatar velocity returned by Bullet.
| * BulletSim: add logic to turn off pre-step actions when object goesRobert Adams2013-01-181-0/+21
| | | | | | | | | | non-active. This turns off 'setForce', 'setTorque' and 'moveToTarget' when the object is selected or made non-physical.
* | 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
|\ \ \ \ | | |/ / | |/| |