aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-1611-63/+243
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-01-1633-151/+833
| |\
| | * 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
| | * BulletSim: add debugging messages to know when assets for physicalRobert Adams2013-01-154-17/+51
| | * BulletSim: reduce maximum force a script can apply (like in llApplyImpulse)Robert Adams2013-01-151-3/+3
| | * Implement co-operative script termination if termination comes during a scrip...Justin Clark-Casey (justincc)2013-01-1618-54/+327
| | * Revert "Implement co-operative script termination if termination comes during...Justin Clark-Casey (justincc)2013-01-167-289/+13
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-1611-31/+372
| | |\
| | * | Implement co-operative script termination if termination comes during a scrip...Justin Clark-Casey (justincc)2013-01-167-13/+289
| | * | Instead of passing separate engine, part and item components to script APIs, ...Justin Clark-Casey (justincc)2013-01-1515-79/+109
| * | | 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
| * | | Fix llSetRegionPos and detail behaviors of llSet[Link]PrimitiveParams[Fast]()Melanie2013-01-151-5/+9
* | | | JustinCC's core re-mergeMelanie2013-01-1618-91/+231
* | | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-1616-51/+413
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-1529-335/+662
| |\ \ \
| | * | | BulletSim: tweeks to improve hover.Robert Adams2013-01-151-5/+21
| | * | | BulletSim: temporarily disable banking and direction deflectionRobert Adams2013-01-152-10/+29
| | * | | BulletSim: fix logic for enabling unmanaged code debug messages.Robert Adams2013-01-151-1/+14
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensimRobert Adams2013-01-152-12/+7
| | |\ \ \
| | | * | | move resit fix to ScenePresence.cs and allow for requesting sit on objects ot...dahlia2013-01-142-12/+7
| | | | |/ | | | |/|
| | * | | BulletSim: by default, turn on continuious collision detection (CCD)Robert Adams2013-01-151-3/+3
| | |/ /
| | * | Print full stacktrace from plugin loading failure to help determine what went...Justin Clark-Casey (justincc)2013-01-151-2/+5
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-1526-246/+554
| | |\ \
| | | * | BulletSim: fix not moving physical objects below terrain to over terrain.Robert Adams2013-01-145-18/+36
| | * | | refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart i...Justin Clark-Casey (justincc)2013-01-141-72/+55
| * | | | Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-155-0/+298
* | | | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-1625-227/+507
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | BulletSim: disable center-of-mass computation for linksets until debugged. Mo...Robert Adams2013-01-142-25/+36
| * | | | BulletSim: move center of gravity of linkset to its geometric center.Robert Adams2013-01-1110-32/+106
| * | | | BulletSim: add osGetPhysicsEngineType() LSL function and updateRobert Adams2013-01-1112-22/+82
| * | | | BulletSim: Add IsSelected attribute to physical objects. Have vehicles check ...Robert Adams2013-01-114-50/+162
| * | | | Fix exception reporting in SceneObjectPart so it logs what the exception is r...Robert Adams2013-01-111-2/+2
| * | | | BulletSim: Redo linear function coding so they can better interact. New algor...Robert Adams2013-01-112-62/+91
| * | | | BulletSim: remove double application of buoyancy. Centralize computation of b...Robert Adams2013-01-114-65/+59
| |/ / /
* | | | Merge branch 'avination' into careminsterMelanie2013-01-134-32/+42
|\ \ \ \ | | |_|/ | |/| |
| * | | add some sanity checking to HandleAgentRequestSit handlerdahlia2013-01-131-2/+12
| * | | 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
| * | | remove redundant lastPhysGroupPos and lastPhysGroupRot checksUbitUmarov2013-01-111-16/+3
| * | | same for AngularVelocity. Use normal terse updates in place of sendingUbitUmarov2013-01-111-10/+18
| * | | keyframe. Don't use group UpdateRotation since this enqueues a terseUbitUmarov2013-01-111-2/+6
* | | | Merge branch 'master' into careminsterMelanie2013-01-132-3/+13
|\ \ \ \ | | |/ / | |/| |
| * | | BulletSim: fix the 'No recognised physics mesh found ...' error spew by remem...Robert Adams2013-01-111-1/+1
| * | | add some sanity checking to HandleAgentRequestSit handlerdahlia2013-01-101-2/+12
| | |/ | |/|