Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Fix minor issues from commit 28483150 | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -12/+17 | |
| | | | | | | | | | | | | Fix spelling of collide, change to more self-documenting property BadMeshAssetCollideBits, add method doc, change to private to reduce code analysis complexity | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-20 | 7 | -406/+623 | |
|\ \ \ | |/ / | ||||||
| * | | BulletSim: add asset fetching so BulletSim works with new physics asset ↵ | Robert Adams | 2012-10-19 | 4 | -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 Adams | 2012-10-19 | 6 | -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 Adams | 2012-10-19 | 6 | -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 Adams | 2012-10-19 | 5 | -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 Adams | 2012-10-19 | 3 | -11/+6 | |
| | | | | | | | | | | | | initialized and setting of C++ parameters commented out. Comments and logging added. | |||||
| * | | BulletSim: Update BSCharacter to use API2 interface. | Robert Adams | 2012-10-19 | 6 | -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 careminster | Melanie | 2012-10-19 | 1 | -6/+11 | |
|\ \ \ | |/ / | ||||||
| * | | [UNTESTED] core Ode: let broken mesh physical prims collide with land as | UbitUmarov | 2012-10-19 | 1 | -6/+11 | |
| | | | | | | | | | | | | the defaul basic box so they don't go off world. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-19 | 1 | -21/+97 | |
|\ \ \ | |/ / | ||||||
| * | | [UNTESTED] core Ode: stop trying to load a broken asset. Make broken | UbitUmarov | 2012-10-19 | 1 | -21/+97 | |
| | | | | | | | | | | | | assets behave like phantom by Nebadon request | |||||
| * | | missing changed file | UbitUmarov | 2012-10-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | i update core ode plugin and make it load is meshs (i hope) | UbitUmarov | 2012-10-18 | 2 | -2/+51 | |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-10-18 | 17 | -1163/+2271 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||||
| * | | coment a debug warning | UbitUmarov | 2012-10-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | fixes | UbitUmarov | 2012-10-16 | 3 | -67/+82 | |
| | | | ||||||
| * | | missing file | UbitUmarov | 2012-10-13 | 1 | -0/+2 | |
| | | | ||||||
| * | | add mesh cache expire on region startup. Expires will be relative to | UbitUmarov | 2012-10-13 | 4 | -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 ids | UbitUmarov | 2012-10-13 | 2 | -11/+21 | |
| | | | ||||||
| * | | missing file (again) | UbitUmarov | 2012-10-13 | 1 | -4/+8 | |
| | | | ||||||
| * | | longer meshs identification keys, so first part on disk cache is it's asset id | UbitUmarov | 2012-10-13 | 1 | -1/+3 | |
| | | | ||||||
| * | | missing file | UbitUmarov | 2012-10-12 | 1 | -0/+6 | |
| | | | ||||||
| * | | [TEST] disk cache meshs | UbitUmarov | 2012-10-12 | 3 | -282/+532 | |
| | | | ||||||
| * | | commit the right files! | UbitUmarov | 2012-10-12 | 2 | -5737/+4763 | |
| | | | ||||||
| * | | remove some more debug spam on ode | UbitUmarov | 2012-10-12 | 2 | -4766/+5735 | |
| | | | ||||||
| * | | add some quaternion normalizations to keep errors under control | UbitUmarov | 2012-10-10 | 1 | -0/+3 | |
| | | | ||||||
| * | | debug | UbitUmarov | 2012-10-10 | 1 | -0/+6 | |
| | | | ||||||
| * | | fix debug :) | UbitUmarov | 2012-10-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | debug... | UbitUmarov | 2012-10-09 | 1 | -0/+5 | |
| | | | ||||||
| * | | debug... | UbitUmarov | 2012-10-09 | 1 | -2/+5 | |
| | | | ||||||
| * | | avoid crashing so debug is seen | UbitUmarov | 2012-10-09 | 1 | -0/+1 | |
| | | | ||||||
| * | | another debug msg | UbitUmarov | 2012-10-09 | 1 | -0/+22 | |
| | | | ||||||
| * | | force allocation of mesh data on creation ( messy code version ) | UbitUmarov | 2012-10-09 | 9 | -12/+45 | |
| | | | ||||||
| * | | temporary debug code | UbitUmarov | 2012-10-09 | 1 | -0/+19 | |
| | | | ||||||
| * | | fire a extra terseupdate when stopping (like in loosing physics). In some | UbitUmarov | 2012-10-09 | 1 | -0/+3 | |
| | | | | | | | | | | | | cases things seem not to stop | |||||
| * | | Change ray to land colision range limitation so it has no impact on other | UbitUmarov | 2012-10-09 | 1 | -6/+8 | |
| | | | | | | | | | | | | geom types | |||||
| * | | move terrain geom to own ode space. Limit range on raycast if includes | UbitUmarov | 2012-10-09 | 4 | -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 (?) | UbitUmarov | 2012-10-07 | 4 | -117/+112 | |
| | | | ||||||
| * | | bug fix + make costs visible for testing | UbitUmarov | 2012-10-07 | 3 | -37/+76 | |
| | | | ||||||
| * | | refix so we can compile it, loosing alpha scultps fix on core meshmerizer | UbitUmarov | 2012-10-07 | 1 | -0/+11 | |
| | | | ||||||
| * | | fix wrong file commited | UbitUmarov | 2012-10-07 | 1 | -10/+0 | |
| | | | ||||||
| * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-07 | 1 | -24/+7 | |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||||
| | * | | comment out a spam coment on core Meshmerizer | UbitUmarov | 2012-10-07 | 1 | -26/+4 | |
| | | | | ||||||
| * | | | i update core ode plugin and make it load is meshs (i hope) | UbitUmarov | 2012-10-07 | 3 | -24/+118 | |
| | | | | ||||||
| * | | | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts | UbitUmarov | 2012-10-07 | 5 | -1033/+609 | |
| | | | | | | | | | | | | | | | | now | |||||
| * | | | more changes and more non active code | UbitUmarov | 2012-10-04 | 4 | -29/+144 | |
| | | | | ||||||
| * | | | more changes. Most code not in use | UbitUmarov | 2012-10-04 | 5 | -23/+615 | |
| | | | | ||||||
| * | | | missing changed file | UbitUmarov | 2012-10-03 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled | UbitUmarov | 2012-10-03 | 1 | -4/+39 | |
| | | | | | | | | | | | | | | | | for all physics engines) |