aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
| | * | | go back bypassing sog updates control (test)UbitUmarov2013-01-111-12/+12
| | | | |
| | * | | update the last information sent in terse updates where they are sent to allUbitUmarov2013-01-111-10/+19
| | | | | | | | | | | | | | | | | | | | clients and not only on Scheduled sends
| | * | | remove redundant lastPhysGroupPos and lastPhysGroupRot checksUbitUmarov2013-01-111-16/+3
| | | | | | | | | | | | | | | | | | | | in SOG Update(). rootpart does more complet checks
| | * | | same for AngularVelocity. Use normal terse updates in place of sendingUbitUmarov2013-01-111-10/+18
| | | | | | | | | | | | | | | | | | | | imediatly. If that's good for physics, needs to be good for this
| | * | | keyframe. Don't use group UpdateRotation since this enqueues a terseUbitUmarov2013-01-111-2/+6
| | | | | | | | | | | | | | | | | | | | update and we are sending them imediatly
* | | | | Merge branch 'master' into careminsterMelanie2013-01-132-3/+13
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | BulletSim: fix the 'No recognised physics mesh found ...' error spew by ↵Robert Adams2013-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | remembering that the last asset fetch failed until the simulator resets the shape parameters.
| * | | | add some sanity checking to HandleAgentRequestSit handlerdahlia2013-01-101-2/+12
| | |_|/ | |/| |
* | | | Merge branch 'master' into careminsterMelanie2013-01-110-0/+0
|\ \ \ \ | |/ / /
| * | | Implement a workaround solution for saving manual script state changes by ↵Justin Clark-Casey (justincc)2013-01-111-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the user before logout instead of wrongly removing the script early. This workaround relies on the fact that a closing client goes inactive before the attachments derez calls happen. This reverts the change to remove scripts too early instead of stopping them, since the the two step stop then remove is necessary to execute the detach event.
| * | | Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-112-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves making Attachments module listen for start/stop script changes. It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim. Not just in a state where their scripts have been stopped.
* | | | Merge branch 'master' into careminsterMelanie2013-01-116-148/+363
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Fix a regression in the last few scene commands changes where setting these ↵Justin Clark-Casey (justincc)2013-01-111-52/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | via the viewer estate dialog stopped working. Forgot to register the new interface. Also removes some code which got included by adpating an existing module.
| * | | Add "debug scene get" console command to list current scene optionsJustin Clark-Casey (justincc)2013-01-101-2/+43
| | | |
| * | | Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-105-138/+350
| | | | | | | | | | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
| * | | refactor: route the final scene backup through the same code that handles ↵Justin Clark-Casey (justincc)2013-01-101-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | periodic backup This is rather than making unnecessary duplicate checks that the SOG later performs again.
| * | | minor: Capitalize GroupsModule command categoryJustin Clark-Casey (justincc)2013-01-101-1/+1
| | | |
| * | | minor: add missing newline to "debug scene" console commandJustin Clark-Casey (justincc)2013-01-101-1/+1
| | | |
generated by cgit v1.1 at 2024-12-23 06:29:38 +0000