| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2012-06-06 | 1 | -3/+3 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | fix addforce/impulse. | UbitUmarov | 2012-06-04 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-06-02 | 1 | -60/+256 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | ||||
| | * | | Add optional total avatars, total prims and active prims stats to ODE plugin. | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | These will act as a sanity check with the main scene stats, to show that physics scene entities are being managed properly. Total prims will not match scene total prims since physics total does not include phantom prims | ||||
| | * | | If OdeScene.Near() returns no collision contacts, then exit as early as ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+4 |
| | | | | | | | | | | | | | possible. All subsequent code is only relevant if there are contacts. | ||||
| | * | | Add optional stat for the other collision time per frame not spent in ODE ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -1/+16 |
| | | | | | | | | | | | | | native spaces or geom collision code | ||||
| | * | | Add avatar forces calculation, prim force and raycasting per frame ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+46 |
| | | | | | | | | | | | | | millisecond optional stats | ||||
| | * | | Collection optional avatar and prim taint frame millisecond times | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+36 |
| | | | | |||||
| | * | | Remove recent optional native collision frame milliseconds stat | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -13/+1 |
| | | | | | | | | | | | | | Unnecessary since this has now been broken down into space collisions and geom collisions | ||||
| | * | | Add optional stat that records milliseconds spent notifying collision ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+14 |
| | | | | | | | | | | | | | listeners in physics frames | ||||
| | * | | Add avatar and prim update milliseconds per frame optional stats | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+31 |
| | | | | |||||
| | * | | Add option native step frame ms stat | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+21 |
| | | | | |||||
| | * | | Add total ODE frame time optional stat, as a sanity check on the main scene ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+21 |
| | | | | | | | | | | | | | physics stat | ||||
| | * | | Break down native ODE collision frame time stat into native space collision ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -4/+22 |
| | | | | | | | | | | | | | and geom collision stats | ||||
| | * | | Rename new collision stats to 'contacts' - there are/can be multiple ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -6/+6 |
| | | | | | | | | | | | | | contacts per collision and this is what is actually being measured. | ||||
| | * | | Stop adding an unnecessary duplicate _perloopcontact if the avatar is ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+4 |
| | | | | | | | | | | | | | | | | | | | standing on a prim. This has already been added earlier on in the method. | ||||
| | * | | minor: comment out currently unused OdeScene.sCollisionData | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+9 |
| | | | | |||||
| | * | | Add ODE avatar and prim collision numbers if extra stats collection is enabled. | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -5/+34 |
| | | | | |||||
| | * | | Fix OdeScene.GetTopColliders() to return the top 25 colliders rather than ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -19/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | the first 25 that had non-zero collision scores. Also zeros collisions scores on all prims after report collection, not just the top 25. As before, this collision scores are only reset after a report is requested, which may give unrealistic numbers on the first request. So to see more realistic scores, ignore the first report and then refresh the request after a couple of seconds or so. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-31 | 2 | -4/+10 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | ubitode prim: if makebody() is called already having a body, do a full ↵ | UbitUmarov | 2012-05-30 | 1 | -3/+4 |
| | | | | | | | | | | | | | destrution so there are no 'leaks'. | ||||
| | * | | Guard setting the building flag | Melanie | 2012-05-30 | 1 | -0/+4 |
| | | | | |||||
| | * | | Whitespace fix | Melanie | 2012-05-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix physics not reporting collisions only with terrain | UbitUmarov | 2012-05-29 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-31 | 2 | -10/+143 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Add an optional mechanism for physics modules to collect and return ↵ | Justin Clark-Casey (justincc) | 2012-05-31 | 2 | -10/+143 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arbitrary stats. If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule (http://opensimulator.org/wiki/Monitoring_Module) This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings]. This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing. This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds. The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code. | ||||
| * | | | Merge branch 'avination' | Melanie | 2012-05-29 | 4 | -70/+134 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | fix avatars collisions on sim crossings and other few cases where ↵ | UbitUmarov | 2012-05-28 | 1 | -2/+1 |
| | | | | | | | | | | | | | freemove() is called | ||||
| | * | | a bit cleaner code (?) on sculpts/meshs meshing checking | UbitUmarov | 2012-05-28 | 1 | -7/+6 |
| | | | | |||||
| | * | | let meshs work indenpendently of mesh_sculpted_prim config option | UbitUmarov | 2012-05-28 | 1 | -29/+25 |
| | | | | |||||
| | * | | revert making sculpts phanton if sculpt meshing option is off | UbitUmarov | 2012-05-28 | 1 | -2/+0 |
| | | | | |||||
| | * | | Let OOB information usable outside ubitode | UbitUmarov | 2012-05-27 | 3 | -29/+33 |
| | | | | |||||
| | * | | also don't collide sculps or meshs if meshing is OFF | UbitUmarov | 2012-05-21 | 1 | -0/+2 |
| | | | | |||||
| | * | | try to let avas climb higher steps. Will only work in some cases, may have ↵ | UbitUmarov | 2012-05-21 | 2 | -9/+75 |
| | | | | | | | | | | | | | bad effects, so needs some more testing | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-27 | 4 | -154/+178 |
| |\ \ \ | |/ / | |||||
| | * | | minor changes | UbitUmarov | 2012-05-20 | 3 | -32/+24 |
| | | | | |||||
| | * | | reduce useless waste of cpu. Make character collision events be done ↵ | UbitUmarov | 2012-05-19 | 3 | -125/+145 |
| | | | | | | | | | | | | | similiar to parts. Let same thread do it all ( like in parts ) ( to change this some structs copies must be added) | ||||
| | * | | fix character IsPhysical | UbitUmarov | 2012-05-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | add colliders relative velocity projected in collision direction to ↵ | UbitUmarov | 2012-05-19 | 3 | -1/+13 |
| | | | | | | | | | | | | | collisions report information. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-19 | 1 | -2/+8 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | ||||
| | * | | refactor: move EventQueueGet path generation into common method. Rename ↵ | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | some local variables in line with code conventions. Add commented out EQG log lines for future use. | ||||
| | * | | Don't eagerly clear frame collision events when physics actors subscribe and ↵ | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | unsubscribe from collisions, in order to avoid a race condition. Since this is done directly from ScenePresence, it can lead to a race condition with the simulator loop. There's no real point doing it anyway since the clear will be done very shortly afterwards by the simulate loop and either there are no events (for a new avatar) or events don't matter (for a departing avatar). This matches existing behaviour in OdePrim | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-15 | 2 | -11/+68 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | ubitODE: if stopped having collisions do report zero colisions once, so ↵ | UbitUmarov | 2012-05-15 | 2 | -9/+43 |
| | | | | | | | | | | | | | collision_end event can be triggered. Changed reports rate to the requested rate and not full ode rate. | ||||
| | * | | ubitODE: fix not reporting land collisions on same cases. | UbitUmarov | 2012-05-15 | 1 | -2/+25 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-13 | 3 | -24/+69 |
| |\ \ \ | |/ / | |||||
| | * | | ubitODE fix force in case of mlinear motor offset present | UbitUmarov | 2012-05-13 | 1 | -4/+5 |
| | | | | |||||
| | * | | ubitODE let vehicles responde faster to changes of some parameters like ↵ | UbitUmarov | 2012-05-12 | 1 | -12/+13 |
| | | | | | | | | | | | | | motors decay times | ||||
| | * | | ubitODE reduced again a bit the max allowed correction velocity on ↵ | UbitUmarov | 2012-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | colisions, to reduce a bit bouncing inerent to colisions. | ||||
| | * | | ubitODE: trial workaround for avatar colisions | UbitUmarov | 2012-05-12 | 1 | -6/+49 |
| | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |