Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | revert terminal vel reduction. It helped but not efective | UbitUmarov | 2012-05-11 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-05-13 | 3 | -106/+163 |
|\ \ \ | |/ / | |||||
| * | | reduce avatars terminal velocity to less than 30m/s or colisions with basic ↵ | UbitUmarov | 2012-05-10 | 2 | -6/+9 |
| | | | | | | | | | | | | boxs fail badly. (ode lib problem. chode just may support a bit higher velocity due to the use of tilt). | ||||
| * | | ubitode: changes to vehicles servos | UbitUmarov | 2012-05-10 | 1 | -100/+154 |
| | | | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-05-08 | 1 | -11/+17 |
|\ \ \ | |/ / | |||||
| * | | minor change to linear motor decay | UbitUmarov | 2012-05-07 | 1 | -11/+17 |
| | | | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-05-07 | 2 | -21/+108 |
|\ \ \ | |/ / | |||||
| * | | UbitODE: reduced the diference btw dinamic and static friction, making ↵ | UbitUmarov | 2012-05-05 | 1 | -17/+17 |
| | | | | | | | | | | | | dinamic larger more identical to static. | ||||
| * | | ubitODE prims: - moved outbounds checking back to ↵ | UbitUmarov | 2012-05-05 | 1 | -4/+91 |
| | | | | | | | | | | | | UpdatePositionAndVelocity() from move() so it's done at end of each ode step and when it reports positions to core. There should be no need to check in both places. - Addforce() and AddAngularForce now apply a force if parameter pushforce is true or apply a impulse if false as it's actually needed (the prims grab case should be a force) | ||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-05-05 | 1 | -2/+8 |
|\ \ \ | |/ / | |||||
| * | | force lower avatar density for testing | UbitUmarov | 2012-05-05 | 1 | -0/+4 |
| | | | |||||
| * | | UbitODE: leave avatar 'freemove' state (entered on setmomentum) on any ↵ | UbitUmarov | 2012-05-04 | 1 | -2/+4 |
| | | | | | | | | | | | | significant change like new 'velocity' or new position, etc, requests | ||||
* | | | Merge branch 'avination' | Melanie | 2012-05-03 | 1 | -5/+6 |
|\ \ \ | |/ / | |||||
| * | | Improved sitted avatars crossings ( plus tests on vehicles) | UbitUmarov | 2012-05-02 | 1 | -5/+6 |
| | | | |||||
* | | | Merge branch 'avination' | Melanie | 2012-05-02 | 3 | -112/+123 |
|\ \ \ | |/ / | |||||
| * | | ubitODE fix applyROtationImpulse, let vehicle hover be relative to root ↵ | UbitUmarov | 2012-04-29 | 2 | -15/+32 |
| | | | | | | | | | | | | prim and not center of mass ( as SL docs said) updated some flags to current ones | ||||
| * | | ubitode fix inertia for same cases. Added a nasty lock on llGetCenterOfMass ↵ | UbitUmarov | 2012-04-29 | 2 | -97/+91 |
| | | | | | | | | | | | | and simulate | ||||
* | | | Merge branch 'avination' | Melanie | 2012-04-29 | 4 | -219/+314 |
|\ \ \ | |/ / | |||||
| * | | fix llGetCenterOfMass ( checked with ubitODE only) | UbitUmarov | 2012-04-28 | 1 | -5/+30 |
| | | | |||||
| * | | Oooops don't hover underground but do hover | UbitUmarov | 2012-04-27 | 1 | -26/+27 |
| | | | |||||
| * | | reorder priority of vehicle hover flags | UbitUmarov | 2012-04-27 | 1 | -109/+114 |
| | | | |||||
| * | | test | UbitUmarov | 2012-04-27 | 1 | -1/+7 |
| | | | |||||
| * | | test | UbitUmarov | 2012-04-27 | 1 | -2/+2 |
| | | | |||||
| * | | itest | UbitUmarov | 2012-04-27 | 1 | -2/+1 |
| | | | |||||
| * | | test | UbitUmarov | 2012-04-27 | 1 | -13/+11 |
| | | | |||||
| * | | testing | UbitUmarov | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | testing.... | UbitUmarov | 2012-04-27 | 1 | -41/+78 |
| | | | |||||
| * | | ubitODE fix don't report colisions with a volume detector ( only report to it ) | UbitUmarov | 2012-04-27 | 1 | -12/+16 |
| | | | |||||
| * | | testing | UbitUmarov | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | testing | UbitUmarov | 2012-04-27 | 1 | -58/+71 |
| | | | |||||
| * | | testing | UbitUmarov | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | testing | UbitUmarov | 2012-04-27 | 1 | -0/+6 |
| | | | |||||
| * | | TESTING | UbitUmarov | 2012-04-27 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-25 | 3 | -13/+43 |
|\ \ \ | |/ / | | | | | | | careminster |