Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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) | ||||
| * | | making meshworker have more work.. | UbitUmarov | 2012-10-03 | 2 | -4/+23 |
| | | | |||||
| * | | introduce a ODEMeshWorker class, should be pure cosmetic changes for now | UbitUmarov | 2012-10-03 | 7 | -163/+262 |
| |/ | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 12 | -207/+335 |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | BulletSim: only use native sphere shape if it is a sphere. | Robert Adams | 2012-10-12 | 1 | -1/+2 |
| | | | |||||
| * | | BulletSim: fix problem with some shapes (like cylinders) being implemented ↵ | Robert Adams | 2012-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | as cubes. | ||||
| * | | BulletSim: remove some unused API2 calls because they were removed from ↵ | Robert Adams | 2012-10-11 | 2 | -14/+2 |
| | | | | | | | | | | | | Bullet 2.81 | ||||
| * | | BulletSim: normalize physics FPS to 45 (for real this time). | Robert Adams | 2012-10-11 | 1 | -2/+2 |
| | | | |||||
| * | | BulletSim: normalize physics FPS to 45. | Robert Adams | 2012-10-11 | 1 | -3/+4 |
| | | | |||||
| * | | BulletSim: Use full linkset mass when computing vehicle gravity force. Add ↵ | Robert Adams | 2012-10-11 | 3 | -11/+16 |
| | | | | | | | | | | | | taint-time specification to new AddForce(). | ||||
| * | | BulletSim: Change defaults for constraint CFM and ERP to make large linksets ↵ | Robert Adams | 2012-10-11 | 2 | -11/+8 |
| | | | | | | | | | | | | more rigid. Remove mass calculation for terrain (it should stay a static object). | ||||
| * | | BulletSim: cosmetic changes (comments and renaming). Give mass to terrain to ↵ | Robert Adams | 2012-10-11 | 7 | -52/+74 |
| | | | | | | | | | | | | improve interactions. | ||||
| * | | BulletSim: Add Force* operations to objects to allow direct push to engine. | Robert Adams | 2012-10-11 | 7 | -29/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update BSDynamics to use same (don't want to delay updates til next taint-time. Suppress queuing a taint update for position and orientation calls if value does not change. Move Bullet timing statistics call from C# back to C++ code. Throttle taints per simulation step and add parameter to set. By default, don't create hulls for physical objects. Add a parameter to turn on and off. | ||||
| * | | BulletSim: Fix crash when linking large physical linksets. | Robert Adams | 2012-10-11 | 8 | -102/+132 |
| | | | | | | | | | | | | | | | | | | | | | | | | Properly remove and restore linkage constraints when upgrading a prim's mesh to a hull. Lots more debug logging. Definitions and use of Bullet structure dumping. Centralize detail logging so a Flush() can be added for debugging. | ||||
| * | | av_av_collisions_off = false OdePhysics Settings in OpenSimDefaults.ini - ↵ | teravus | 2012-10-09 | 1 | -2/+9 |
| | | | | | | | | | | | | No Avatar Avatar Collisions. This causes avatar to be able to walk through each other as if they're ghosts but still interact with the environment. |