| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-23 | 7 | -502/+617 |
| |\ | | | | | | | careminster | ||||
| | * | ubitODE - do own timing control (as chODE does) until heartbeat does it right | UbitUmarov | 2012-04-23 | 2 | -21/+34 |
| | | | |||||
| | * | ubitODE - several changes... | UbitUmarov | 2012-04-23 | 3 | -431/+379 |
| | | | |||||
| | * | fix a bug i added fixing another.... | UbitUmarov | 2012-04-22 | 1 | -2/+5 |
| | | | |||||
| | * | ubitODE: - don't try to hover underground unless volumedetector (that ↵ | UbitUmarov | 2012-04-21 | 1 | -47/+93 |
| | | | | | | | | | doesn't colide with it) | ||||
| | * | changed seletion code. SOP now knows about parts selection. UI actions are ↵ | UbitUmarov | 2012-04-20 | 3 | -24/+104 |
| | | | | | | | | | sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects | ||||
| | * | ubitODE: - Change triangles used in terrain height estimation | UbitUmarov | 2012-04-20 | 1 | -11/+28 |
| | | | |||||
| | * | ubitODE - again avatar/terrain collision. Reduce new viewers interpolators ↵ | UbitUmarov | 2012-04-20 | 1 | -6/+14 |
| | | | | | | | | | efects reporting null velocity and aceleration when stopped near the right position, where they can still have instantanius large values that can get magnified by interpolators, specially using diferent timing estimation. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-23 | 13 | -124/+453 |
| |\ \ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | | Mantis 5977 Corrections to llRegionSayTo | Talun | 2012-04-23 | 5 | -58/+100 |
| | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| | * | | refactor: simply some properties code in BasicPhysicsPlugin | Justin Clark-Casey (justincc) | 2012-04-22 | 2 | -72/+12 |
| | | | | |||||
| | * | | Make TestSetPhysicsSinglePrim() actually add the object to the scene in ↵ | Justin Clark-Casey (justincc) | 2012-04-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | order to test more code paths. | ||||
| | * | | Fix bug where setting phantom on a prim would result in a server log message ↵ | Justin Clark-Casey (justincc) | 2012-04-22 | 6 | -32/+382 |
| | | | | | | | | | | | | | | | | | | | | | | | | | rather than setting phantom. This was an oversight when removing some race conditions from PhysicsActor setting recently. Regression tests extended to probe this code path. Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-22 | 5 | -247/+351 |
| |\ \ \ | |/ / | |||||
| | * | | Comment out spurious Body != IntPtr.Zero code after disableBody(), since ↵ | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -10/+20 |
| | | | | | | | | | | | | | disableBody() sets Body == IntPtr.Zero on all code paths. | ||||
| | * | | refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate. | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -115/+117 |
| | | | | |||||
| | * | | Add test for setting physics in a linkset | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -2/+28 |
| | | | | |||||
| | * | | Add regression test for prim status when root prim in a new linkset is ↵ | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -1/+20 |
| | | | | | | | | | | | | | non-physical | ||||
| | * | | Fix a bug where linking a non-physical prim with a physical prim as root ↵ | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | would make the non-physical prim phantom rather than part of the physics object. On region restart, the whole object would become physical as expected. Observed behaviour from elsewhere is that all prims in a new linkset should take on the status of the root prim. Add regression test for this behaviour. | ||||
| | * | | Add test for correct physics status on linking two physics objects | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -2/+26 |
| | | | | | | | | | | | | | Also fixes last build break. | ||||
| | * | | refactor: extract common setup code in SceneObjectStatusTests | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -10/+16 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -120/+95 |
| | |\ \ | |||||
| | | * | | Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim. | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -116/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | | prim_geom == IntPtr.Zero only before a new add prim taint is processed (which is the first taint) or in operations such as scale change which are done in taint or under lock. Therefore, we can remove these checks which were not consistently applied anyway. If there is a genuine problem, better to see it quickly in a NullReferenceException than hide the bug. | ||||
| | | * | | Improve bitmap disposal to do null checks and not to potentially try ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disposal of uninitialized variables. This issue doesn't cause the mono 2.10.5 compiler to fail but appears to cause the windows compiler to fail. Resolves http://opensimulator.org/mantis/view.php?id=5973 | ||||
| | * | | | Add TestSetPhysics() to SOP status tests | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -3/+26 |
| | |/ / | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-20 | 1 | -12/+10 |
| |\ \ \ | |/ / | |||||
| | * | | If a physical prim is manually moved (e.g. by a user) then set the geometry ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -12/+10 |
| | | | | | | | | | | | | | | | | | | | | | | position as well as the body position This is necessary to stop the moved prim snapping back to the original position on deselection if moved only once This resolves http://opensimulator.org/mantis/view.php?id=5966 | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-20 | 3 | -46/+84 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | ||||
| | * | | Always dispose of existing opened bitmap from file in SaveFile(), instead of ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -22/+37 |
| | | | | | | | | | | | | | simply dropping the reference if the existing file didn't contain a bitmap of the same size. | ||||
| | * | | Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 2 | -18/+31 |
| | | | | | | | | | | | | | JPEG.cs | ||||
| | * | | concerns GenericSystemDrawing.cs | Garmin Kawaguichi | 2012-04-20 | 1 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | in OpenSim\Region\CoreModules\World\Terrain\FileLoaders\GenericSystemDrawing.cs Ln 67 Apply Justin's solution Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com> | ||||
| | * | | Stop teleports from dropping tall avatars through or embedding them in the ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | floor when lured by short avatars. This involves giving the ceiling of the Z-component in a lure rather than the floor. Ideally we would give the exact float compensating for relative avatar height but it looks like that isn't possible with the parcel id format used in lures | ||||
| | * | | Fix a logic error in app domain creation | Melanie | 2012-04-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-20 | 9 | -221/+170 |
| |\ \ \ | | |/ | |/| | | | | careminster | ||||
| | * | | changed - VolumeDetect and phantom setting interaction. Script VD(true) ↵ | UbitUmarov | 2012-04-19 | 2 | -13/+40 |
| | | | | | | | | | | | | | forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics. | ||||
| | * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-04-19 | 6 | -4/+28 |
| | |\ \ | |||||
| | | * | | Allow setting a specific target velocity on TeleportWithMomentum | Melanie | 2012-04-18 | 1 | -1/+11 |
| | | | | | |||||
| | | * | | Allow scripts in attachments owned by the NPC to control the NPC | Melanie | 2012-04-18 | 1 | -1/+7 |
| | | | | | |||||
| | | * | | Prevent objects rezzed in sim from being seen as attachments and becoming ↵ | Melanie | 2012-04-17 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | uneditable or crashers. (Foxtail of death) | ||||
| | * | | | ubitODE still retouching character pid | UbitUmarov | 2012-04-18 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | ubitODE - retouch character PIDs | UbitUmarov | 2012-04-18 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | ubitODE: prims - update managed dinamic parameters from unmanaged at ODE ↵ | UbitUmarov | 2012-04-17 | 1 | -78/+46 |
| | | | | | | | | | | | | | | | | | rate and not heartbeat. | ||||
| | * | | | ubitODE: - character managed ode was only getting position etc from ↵ | UbitUmarov | 2012-04-17 | 2 | -119/+48 |
| | | | | | | | | | | | | | | | | | unmanaged at heartbeat rate like core ode. Now do it at ODE rate in move(..). UpdatePositionAndVelocity() called once per heartbeat is now empty. | ||||
| | * | | | ubitODE: - made avatar/ground collision pid servo a bit softer since seems a ↵ | UbitUmarov | 2012-04-17 | 2 | -6/+7 |
| | | | | | | | | | | | | | | | | | bit unstable with small avas in AVI even if fine on my testsite - Removed reading of PID parameters from config files since that only serves to mess things up and adds more unknowns | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-04-18 | 2 | -4/+8 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-04-18 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | On "show part" command, show link number. | Justin Clark-Casey (justincc) | 2012-04-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the Parts count which was rather pointless for a prim (it was either 1 if a child or the number of parts if the root). This information is still avaliable on the "show object" command. | ||||
| | * | | | | Don't re-add the assembly resolver for each script if not creating the appdomain | Melanie | 2012-04-18 | 1 | -4/+8 |
| | |/ / / | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-04-18 | 8 | -2/+1528 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-18 | 5 | -1/+1469 |
| | |\ \ \ | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |