aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)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 scrip...Justin Clark-Casey (justincc)2013-01-168-14/+293
| * | Instead of passing separate engine, part and item components to script APIs, ...Justin Clark-Casey (justincc)2013-01-1516-79/+110
* | | 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
| | * | 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-153-13/+8
| | |\ \
| | | * | move resit fix to ScenePresence.cs and allow for requesting sit on objects ot...dahlia2013-01-142-12/+7
| | | * | 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
| | |/
| | * 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-1530-246/+554
| | |\
| | | * BulletSim: fix not moving physical objects below terrain to over terrain.Robert Adams2013-01-145-18/+36
| * | | Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-155-0/+298
* | | | Merge commit '7978b349bd400d14b7ecd4f8274af1921f435fee' into careminsterMelanie2013-01-160-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart i...Justin Clark-Casey (justincc)2013-01-141-72/+55
* | | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-1629-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-1114-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
| * | | 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
| | * | | 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
| | |_|/ | |/| |
* | | | Merge branch 'master' into careminsterMelanie2013-01-110-0/+0
|\ \ \ \ | |/ / /
| * | | Implement a workaround solution for saving manual script state changes by the...Justin Clark-Casey (justincc)2013-01-111-5/+19
| * | | Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-112-1/+20
* | | | Merge branch 'master' into careminsterMelanie2013-01-116-148/+363
|\ \ \ \ | |/ / /
| * | | Fix a regression in the last few scene commands changes where setting these v...Justin Clark-Casey (justincc)2013-01-111-52/+2
| * | | 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
| * | | refactor: route the final scene backup through the same code that handles per...Justin Clark-Casey (justincc)2013-01-101-10/+1
| * | | 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