Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ubitwork' | Melanie | 2012-04-17 | 1 | -0/+1 |
|\ | |||||
| * | ubitODE: bug fix let avatars colide with volume detectors | UbitUmarov | 2012-04-17 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'ubitwork' | Melanie | 2012-04-16 | 2 | -8/+16 |
|\ \ | |/ | |||||
| * | ubitODE: - fix remove characters from default raycasts filters as older code ↵ | UbitUmarov | 2012-04-16 | 2 | -8/+16 |
| | | | | | | | | (or camera is very odd) - Slow down avatar if velocity is higher than 50m/s as in chODE | ||||
* | | Downgrade an error log message to info because there is nothing we can do if | Melanie | 2012-04-16 | 2 | -2/+2 |
|/ | | | | an asset is damaged so it should not spew red ink. | ||||
* | chODE: if character velocity > 50m/s apply breaks. In free fall this will ↵ | UbitUmarov | 2012-04-16 | 1 | -1/+10 |
| | | | | give a terminal velocity +- 60m/s | ||||
* | chODE bug fix | UbitUmarov | 2012-04-16 | 1 | -7/+9 |
| | |||||
* | ubitODE + physmanager: - Revised use of ODE collisions categories and ↵ | UbitUmarov | 2012-04-16 | 7 | -729/+983 |
| | | | | bits(flags) for better use as filters together with top spaces (for example physical prims are on topactivespace and not physical are on topstaticspace) - Added new world raycast with filters. This blocks calling thread with a timeout of 500ms waiting for heartbeat ode thread signal job done. - Don't let ode bodies being disabled for 2 long except for vehicles. This is necessary to detect when the object is at rest at top of other and that is removed. Assume that vehicles can be enabled by used action. | ||||
* | Use chode character actor.SetMomentum() to force full restore Velocity in ↵ | UbitUmarov | 2012-04-14 | 1 | -1/+19 |
| | | | | scenepresence TeleportWithMomentum(), since actor.Velocity was selected by original coders as the input of a desired velocity (even 'forces') that is modified by character conditions, like not changing velocity.Z if it is in free fall. | ||||
* | chODE and ubitODE always return prim mass (they where returning object mass ↵ | UbitUmarov | 2012-04-09 | 4 | -69/+315 |
| | | | | on physical prims) so SOG can do the total add. (ubitODE as more code to use a simpler terrain geom on a modified ode lib but should do autodetect and work with normal lib). | ||||
* | reduced instability in vertical atractor with eficiency of 1 and banking | UbitUmarov | 2012-03-31 | 1 | -9/+13 |
| | | | | this will need a nicer solution sometime... | ||||
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-27 | 3 | -9/+48 |
|\ | |||||
| * | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 3 | -9/+48 |
| |\ | |||||
| | * | BulletSim: make avatar animations update properly. | Robert Adams | 2012-03-26 | 3 | -9/+48 |
| | | | | | | | | | | | | | | | | | | | | | It seems that ODE calls the avatar collision handling routine even if there are no collisions. This causes the animation to be updated. So, for instance, going from HOVER to FLY is caused by the physics engine calling the collision routine each frame with 0 collisions. | ||||
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-26 | 5 | -40/+135 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 5 | -40/+135 |
| |\ \ | | |/ | |||||
| | * | BulletSim: fix typo introducted by previous checkins (git merge sometimes ↵ | Robert Adams | 2012-03-26 | 1 | -3/+0 |
| | | | | | | | | | | | | makes mistakes) | ||||
| | * | Merge branch 'bulletsim1' of ↵ | Robert Adams | 2012-03-23 | 1 | -1/+6 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | ssh://island.sciencesim.com/home/sceneapi/radams1/bs-opensim into bulletsim1 Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | ||||
| | | * | BulletSim: remove confusion between angularVelocity and rotationalVelocity ↵ | Robert Adams | 2012-03-22 | 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-21 | 2 | -17/+17 |
| | | | | | | | | | | | | | | | | friction and restitution runtime settable parameters. | ||||
| | | * | BulletSim: Add AvatarRestitution parameter. Centralize computation of ↵ | Robert Adams | 2012-03-21 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | buoyancy for flying. Tweek avatar default friction and resititution | ||||
| | | * | BulletSim: set buoyancy in only one place | Robert Adams | 2012-03-21 | 1 | -5/+3 |
| | | | | |||||
| | | * | BulletSim: add some new runtime setable parameters to match the dll. | Robert Adams | 2012-03-21 | 2 | -7/+16 |
| | | | | |||||
| | | * | BulletSim: Update list of TODO tasks | Robert Adams | 2012-03-21 | 1 | -0/+13 |
| | | | | |||||
| | * | | BulletSim: change default of shouldDisableContactPoolDynamicAllocation from ↵ | Robert Adams | 2012-03-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | False to True. It seems that collisions don't happen well when it is False (things fall through terrain). | ||||
| | * | | BulletSim: Add new configuration parameters to get and set console commands | Robert Adams | 2012-03-23 | 1 | -4/+32 |
| | | | | |||||
| | * | | BulletSim: add a bunch of internal Bullet configuration parameters to ↵ | Robert Adams | 2012-03-23 | 2 | -0/+43 |
| | | | | | | | | | | | | | | | | OpenSimDefaults.ini and the code. | ||||
| | * | | 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 |
| | |