Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | BulletSim: remove confusion between angularVelocity and rotationalVelocity ↵ | Robert Adams | 2012-03-23 | 3 | -15/+11 | |
| | | | | | | | | | | | | | | | | (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID. | |||||
| | * | | BulletSim: update TODO list. Rearrange code for readability. Add per object ↵ | Robert Adams | 2012-03-23 | 2 | -17/+17 | |
| | | | | | | | | | | | | | | | | friction and restitution runtime settable parameters. | |||||
| | * | | BulletSim: Add AvatarRestitution parameter. Centralize computation of ↵ | Robert Adams | 2012-03-23 | 2 | -3/+9 | |
| | | | | | | | | | | | | | | | | buoyancy for flying. Tweek avatar default friction and resititution | |||||
| | * | | BulletSim: set buoyancy in only one place | Robert Adams | 2012-03-23 | 1 | -5/+3 | |
| | | | | ||||||
| | * | | BulletSim: add some new runtime setable parameters to match the dll. | Robert Adams | 2012-03-23 | 2 | -7/+16 | |
| | | | | ||||||
| | * | | BulletSim: Update list of TODO tasks | Robert Adams | 2012-03-23 | 1 | -0/+13 | |
| | |/ | ||||||
* | | | UbitOde let caller try to build meshs like done in chode. Changing this was ↵ | UbitUmarov | 2012-03-24 | 2 | -3885/+3959 | |
| | | | | | | | | | | | | a bad move i made. Variable colisions softness. | |||||
* | | | Avatars have no bounce | UbitUmarov | 2012-03-24 | 3 | -3705/+3955 | |
|/ / | ||||||
* | | minor clean | UbitUmarov | 2012-03-21 | 1 | -27/+24 | |
| | | ||||||
* | | missed a creatMesh in chODE. temporary removed m_meshfailed test since it ↵ | UbitUmarov | 2012-03-21 | 1 | -4/+9 | |
| | | | | | | | | may colide with how meshs and sculpts are loaded. This needs a good revision.. | |||||
* | | shapetype support on chOde so it can also request a simple convex hull 'mesh' | UbitUmarov | 2012-03-21 | 2 | -34/+46 | |
| | | ||||||
* | | Changes of PrimShapeType should now work with UbitOde ( almost untested ) | UbitUmarov | 2012-03-21 | 1 | -3710/+3724 | |
| | | ||||||
* | | Tell physics about physics shape when creating. Added some virtual methods ↵ | UbitUmarov | 2012-03-21 | 4 | -5/+55 | |
| | | | | | | | | to get/set density,gravmod, frition,bounce and shape type ( not in use ). UbitOde now should do convex type on creation or everytime the mesh is changed ( as in change size, shape, etc ) | |||||
* | | add convex state to mesh key, so a change is detected. | UbitUmarov | 2012-03-21 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'ubitwork' | Melanie | 2012-03-20 | 5 | -129/+311 | |
|\ \ | ||||||
| * | | let convex be a parameter to createMesh so it can be used. Was forced to add ↵ | UbitUmarov | 2012-03-21 | 4 | -7/+21 | |
| | | | | | | | | | | | | it also to original mesher code and zeromesher | |||||
| * | | added convex decomposition hulls support. Hardcoded to use mesh or this. ↵ | UbitUmarov | 2012-03-20 | 1 | -18/+146 | |
| | | | | | | | | | | | | (so no simple hull of convex prims for now). | |||||
| * | | WORK in progress!! Now it reads the simple hull shape to use if convex shape ↵ | UbitUmarov | 2012-03-20 | 2 | -124/+164 | |
| | | | | | | | | | | | | is selected for a prim. Due to ODE limitations on convex hulls colisions, it creates a mesh. Being work in progress it is hardcoded to only read that simple convex hull for now. It writes a file named "lixo_lixo.raw" that can be imported into blender for examination of the created mesh (the last one loaded and also hardcoded). To play with put in opensim.ini "meshing = UbitMeshmerizer" | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -1/+1 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | | Add prim name to "[MESH]: No recognized physics mesh..." log message | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 2 | -11/+23 | |
|\ \ \ | |/ / | | / | |/ |/| | ||||||
| * | refactor: precalculate the fixed movement factor for avatar tilting ↵ | Justin Clark-Casey (justincc) | 2012-03-20 | 2 | -8/+16 | |
| | | | | | | | | (sqrt(2)) rather than doing it multiple times on every move. | |||||
| * | refactor: Eliminate unnecessary duplicate avCapsuleTilted | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -3/+7 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -10/+16 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs | |||||
| * | Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at ↵ | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -10/+16 | |
| | | | | | | | | | | | | the same time. Have to lock m_MeshToTriMeshMap as property is static and with more than one region two scene loops could try to manipulate at the same time. | |||||
* | | added a new UbitMeshing module so i can mess it... | UbitUmarov | 2012-03-17 | 6 | -0/+4726 | |
| | | ||||||
* | | ubitode prim select was not doing phantom case | UbitUmarov | 2012-03-12 | 1 | -6/+17 | |
| | | ||||||
* | | missing file in ubitODE | UbitUmarov | 2012-03-12 | 1 | -0/+1 | |
| | | ||||||
* | | ubitOde also knows a bit more about physical phantom | UbitUmarov | 2012-03-11 | 1 | -29/+142 | |
| | | ||||||
* | | more phantom physics ( chODE and a fix in manager physicsactor | UbitUmarov | 2012-03-11 | 2 | -62/+121 | |
| | | ||||||
* | | initial steps to support physical phantoms | UbitUmarov | 2012-03-11 | 6 | -13/+73 | |
| | | ||||||
* | | ubitOde bug | UbitUmarov | 2012-03-09 | 1 | -2/+4 | |
| | | ||||||
* | | let chode and ubitode find ode.dll on windows | UbitUmarov | 2012-03-09 | 2 | -0/+7 | |
| | | ||||||
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-07 | 7 | -787/+792 | |
|\ \ | | | | | | | | | | careminster | |||||
| * | | update ubitOde | UbitUmarov | 2012-03-05 | 4 | -78/+297 | |
| | | | ||||||
| * | | update UbitOde | UbitUmarov | 2012-03-04 | 5 | -65/+69 | |
| | | | ||||||
| * | | update UbitODE | UbitUmarov | 2012-03-04 | 3 | -36/+55 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-03 | 1 | -5/+3 | |
| |\ \ | ||||||
| * | | | update ubitODE | UbitUmarov | 2012-03-02 | 1 | -15/+45 | |
| | | | | ||||||
| * | | | ubitODE bug fix | UbitUmarov | 2012-02-29 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | update ubitODE to current working state | UbitUmarov | 2012-02-29 | 2 | -113/+199 | |
| | | | | ||||||
| * | | | fix | UbitUmarov | 2012-02-29 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | chODE: bad meshs get a a basic box or sphere geom with setted prim size. ↵ | UbitUmarov | 2012-02-29 | 2 | -503/+148 | |
| | | | | | | | | | | | | | | | | They will not colide if non-physical and Will collide with land if physical. assume UNTESTED | |||||
* | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-04 | 6 | -641/+496 | |
|\ \ \ \ | | |/ / | |/| | | | | | | careminster | |||||
| * | | | This still causes terrain artefacts | Melanie | 2012-03-02 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Revert " fix my bug on ChODE terrain heightmap build" This reverts commit aa77d1d486f11da7dc841190f1ca85e085d0d648. | |||||
| * | | | This still causes terrain artefacts | Melanie | 2012-03-02 | 1 | -3/+1 | |
| |/ / | | | | | | | | | | | | | | | | Revert " fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1." This reverts commit 15bc539bd49e7a09c1ec6e539871cde5eee6032e. | |||||
| * | | made box a little larger | UbitUmarov | 2012-02-28 | 1 | -6/+6 | |
| | | | ||||||
| * | | A few blind changes to go try to go around bad mesh little box replacement fail | UbitUmarov | 2012-02-28 | 1 | -67/+50 | |
| | | | ||||||
| * | | Really dirty hack to make sims start. Causes errors but the ting runs. Remove | Melanie | 2012-02-28 | 1 | -1/+5 | |
| | | | | | | | | | | | | when fixed right. | |||||
| * | | Let inworld meshs colide as such and not as basic prim all the time. ↵ | UbitUmarov | 2012-02-27 | 2 | -5/+10 | |
| | | | | | | | | | | | | Removed also LOD, and outerskin on colision meshs. |