aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-207-406/+623
|\
| * BulletSim: add asset fetching so BulletSim works with new physics asset ↵Robert Adams2012-10-194-165/+240
| | | | | | | | | | | | handling. Refactor some names to make them available for the asset tracking and fetching.
| * BulletSim: reorder avatar collision checking to eliminate double collision_end.Robert Adams2012-10-196-35/+43
| | | | | | | | | | | | Various tweekings to avatar shape/mass/inertia/etc. Remove change from avatar radius to diameter. But still the avatar sinks. Collision_end now happens immediately rather than at the next subscription time.
| * BulletSim: change nonimal physics frame rate to 55 to give same numbers as ODE.Robert Adams2012-10-196-52/+57
| | | | | | | | | | | | Change character scaling to represent size of capsule (diameter rather than radius) Modify create capsule call to pass radius and height. Eliminate errors when calculating shape inertia (should have some type checking).
| * BulletSim: remove code in ShapeCollection that hinted at shape sharing.Robert Adams2012-10-195-161/+138
| | | | | | | | | | Add new function to ParameterDefn for calling BulletSimAPI to set values. Tweaking to BSCharacter parameter setting to try and have avatars stand.
| * BulletSim: Fix small problems with last patch: BSScene.World properly ↵Robert Adams2012-10-193-11/+6
| | | | | | | | initialized and setting of C++ parameters commented out. Comments and logging added.
| * BulletSim: Update BSCharacter to use API2 interface.Robert Adams2012-10-196-93/+250
| | | | | | | | | | | | | | | | Add capsule shape to BSShapeCollection(). Remember last updated values so inter frame diffs can be computed. Parameterize avatarStandingFriction and reduce to 10 from 999. The latter high value made avatars very hard to push. Set CCD parameters for prims and characters of specified.
* | Merge branch 'master' into careminsterMelanie2012-10-191-6/+11
|\ \ | |/
| * [UNTESTED] core Ode: let broken mesh physical prims collide with land asUbitUmarov2012-10-191-6/+11
| | | | | | | | the defaul basic box so they don't go off world.
* | Merge branch 'master' into careminsterMelanie2012-10-191-21/+97
|\ \ | |/
| * [UNTESTED] core Ode: stop trying to load a broken asset. Make brokenUbitUmarov2012-10-191-21/+97
| | | | | | | | assets behave like phantom by Nebadon request
| * missing changed fileUbitUmarov2012-10-181-1/+1
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-182-2/+51
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'avination' into careminsterMelanie2012-10-1817-1163/+2271
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs
| * | coment a debug warningUbitUmarov2012-10-161-1/+1
| | |
| * | fixesUbitUmarov2012-10-163-67/+82
| | |
| * | missing fileUbitUmarov2012-10-131-0/+2
| | |
| * | add mesh cache expire on region startup. Expires will be relative toUbitUmarov2012-10-134-3/+88
| | | | | | | | | | | | | | | | | | previus expire (assumed done only once at startup). File 'cntr' on cache folder stores time. Deleting it will force a skip on expire. Default time is 48hours before previus startup to account for failed ones etc.
| * | retouch mesh idsUbitUmarov2012-10-132-11/+21
| | |
| * | missing file (again)UbitUmarov2012-10-131-4/+8
| | |
| * | longer meshs identification keys, so first part on disk cache is it's asset idUbitUmarov2012-10-131-1/+3
| | |
| * | missing fileUbitUmarov2012-10-121-0/+6
| | |
| * | [TEST] disk cache meshsUbitUmarov2012-10-123-282/+532
| | |
| * | commit the right files!UbitUmarov2012-10-122-5737/+4763
| | |
| * | remove some more debug spam on odeUbitUmarov2012-10-122-4766/+5735
| | |
| * | add some quaternion normalizations to keep errors under controlUbitUmarov2012-10-101-0/+3
| | |
| * | debugUbitUmarov2012-10-101-0/+6
| | |
| * | fix debug :)UbitUmarov2012-10-091-1/+1
| | |
| * | debug...UbitUmarov2012-10-091-0/+5
| | |
| * | debug...UbitUmarov2012-10-091-2/+5
| | |
| * | avoid crashing so debug is seenUbitUmarov2012-10-091-0/+1
| | |
| * | another debug msgUbitUmarov2012-10-091-0/+22
| | |
| * | force allocation of mesh data on creation ( messy code version )UbitUmarov2012-10-099-12/+45
| | |
| * | temporary debug codeUbitUmarov2012-10-091-0/+19
| | |
| * | fire a extra terseupdate when stopping (like in loosing physics). In someUbitUmarov2012-10-091-0/+3
| | | | | | | | | | | | cases things seem not to stop
| * | Change ray to land colision range limitation so it has no impact on otherUbitUmarov2012-10-091-6/+8
| | | | | | | | | | | | geom types
| * | move terrain geom to own ode space. Limit range on raycast if includesUbitUmarov2012-10-094-83/+229
| | | | | | | | | | | | | | | | | | terrain until ode doesn't eat all stack. Add a pre-simulation method to do pending actors changes (except mesh assets still not ready to use), to be optionaly called before firing heartbeat. [UNTESTED]
| * | a few changes/fix (?)UbitUmarov2012-10-074-117/+112
| | |
| * | bug fix + make costs visible for testingUbitUmarov2012-10-073-37/+76
| | |
| * | refix so we can compile it, loosing alpha scultps fix on core meshmerizerUbitUmarov2012-10-071-0/+11
| | |
| * | fix wrong file commitedUbitUmarov2012-10-071-10/+0
| | |
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-10-071-24/+7
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| | * | comment out a spam coment on core MeshmerizerUbitUmarov2012-10-071-26/+4
| | | |
| * | | i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-073-24/+118
| | | |
| * | | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculptsUbitUmarov2012-10-075-1033/+609
| | | | | | | | | | | | | | | | now
| * | | more changes and more non active codeUbitUmarov2012-10-044-29/+144
| | | |
| * | | more changes. Most code not in useUbitUmarov2012-10-045-23/+615
| | | |
| * | | missing changed fileUbitUmarov2012-10-031-1/+1
| | | |
| * | | meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabledUbitUmarov2012-10-031-4/+39
| | | | | | | | | | | | | | | | for all physics engines)
| * | | making meshworker have more work..UbitUmarov2012-10-032-4/+23
| | | |
generated by cgit v1.1 at 2024-12-29 15:11:01 +0000