aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-237-502/+617
|\
| * ubitODE - do own timing control (as chODE does) until heartbeat does it rightUbitUmarov2012-04-232-21/+34
| * ubitODE - several changes...UbitUmarov2012-04-233-431/+379
| * fix a bug i added fixing another....UbitUmarov2012-04-221-2/+5
| * ubitODE: - don't try to hover underground unless volumedetector (that doesn't...UbitUmarov2012-04-211-47/+93
| * changed seletion code. SOP now knows about parts selection. UI actions are se...UbitUmarov2012-04-203-24/+104
| * ubitODE: - Change triangles used in terrain height estimationUbitUmarov2012-04-201-11/+28
| * ubitODE - again avatar/terrain collision. Reduce new viewers interpolators ef...UbitUmarov2012-04-201-6/+14
* | Merge branch 'master' into careminsterMelanie2012-04-2313-124/+453
|\ \
| * | Mantis 5977 Corrections to llRegionSayToTalun2012-04-235-58/+100
| * | refactor: simply some properties code in BasicPhysicsPluginJustin Clark-Casey (justincc)2012-04-222-72/+12
| * | Make TestSetPhysicsSinglePrim() actually add the object to the scene in order...Justin Clark-Casey (justincc)2012-04-221-0/+2
| * | Fix bug where setting phantom on a prim would result in a server log message ...Justin Clark-Casey (justincc)2012-04-226-32/+382
* | | Merge branch 'master' into careminsterMelanie2012-04-225-247/+351
|\ \ \ | |/ /
| * | Comment out spurious Body != IntPtr.Zero code after disableBody(), since disa...Justin Clark-Casey (justincc)2012-04-212-10/+20
| * | refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate.Justin Clark-Casey (justincc)2012-04-211-115/+117
| * | Add test for setting physics in a linksetJustin Clark-Casey (justincc)2012-04-211-2/+28
| * | Add regression test for prim status when root prim in a new linkset is non-ph...Justin Clark-Casey (justincc)2012-04-212-1/+20
| * | Fix a bug where linking a non-physical prim with a physical prim as root woul...Justin Clark-Casey (justincc)2012-04-212-0/+22
| * | Add test for correct physics status on linking two physics objectsJustin Clark-Casey (justincc)2012-04-211-2/+26
| * | refactor: extract common setup code in SceneObjectStatusTestsJustin Clark-Casey (justincc)2012-04-211-10/+16
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-212-120/+95
| |\ \
| | * | Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim.Justin Clark-Casey (justincc)2012-04-211-116/+88
| | * | Improve bitmap disposal to do null checks and not to potentially try disposal...Justin Clark-Casey (justincc)2012-04-201-4/+7
| * | | Add TestSetPhysics() to SOP status testsJustin Clark-Casey (justincc)2012-04-212-3/+26
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-04-201-12/+10
|\ \ \ | |/ /
| * | If a physical prim is manually moved (e.g. by a user) then set the geometry p...Justin Clark-Casey (justincc)2012-04-201-12/+10
* | | Merge branch 'master' into careminsterMelanie2012-04-203-46/+84
|\ \ \ | |/ /
| * | Always dispose of existing opened bitmap from file in SaveFile(), instead of ...Justin Clark-Casey (justincc)2012-04-201-22/+37
| * | Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and J...Justin Clark-Casey (justincc)2012-04-202-18/+31
| * | concerns GenericSystemDrawing.csGarmin Kawaguichi2012-04-201-8/+9
| * | Stop teleports from dropping tall avatars through or embedding them in the fl...Justin Clark-Casey (justincc)2012-04-201-1/+7
| * | Fix a logic error in app domain creationMelanie2012-04-181-1/+1
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-209-221/+170
|\ \ \ | | |/ | |/|
| * | changed - VolumeDetect and phantom setting interaction. Script VD(true) forc...UbitUmarov2012-04-192-13/+40
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-04-196-4/+28
| |\ \
| | * | Allow setting a specific target velocity on TeleportWithMomentumMelanie2012-04-181-1/+11
| | * | Allow scripts in attachments owned by the NPC to control the NPCMelanie2012-04-181-1/+7
| | * | Prevent objects rezzed in sim from being seen as attachments and becoming une...Melanie2012-04-172-0/+8
| * | | ubitODE still retouching character pidUbitUmarov2012-04-181-2/+2
| * | | ubitODE - retouch character PIDsUbitUmarov2012-04-181-4/+4
| * | | ubitODE: prims - update managed dinamic parameters from unmanaged at ODE rate...UbitUmarov2012-04-171-78/+46
| * | | ubitODE: - character managed ode was only getting position etc from unmanaged...UbitUmarov2012-04-172-119/+48
| * | | ubitODE: - made avatar/ground collision pid servo a bit softer since seems a ...UbitUmarov2012-04-172-6/+7
* | | | Merge branch 'master' into careminsterMelanie2012-04-182-4/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-04-181-1/+1
| |\ \ \
| | * | | On "show part" command, show link number.Justin Clark-Casey (justincc)2012-04-181-1/+1
| * | | | Don't re-add the assembly resolver for each script if not creating the appdomainMelanie2012-04-181-4/+8
| |/ / /
* | | | Merge branch 'master' into careminsterMelanie2012-04-188-2/+1528
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-185-1/+1469
| |\ \ \