Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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. | |||||
| * | | update ubitODE to my current working state | UbitUmarov | 2012-02-27 | 4 | -568/+378 | |
| | | | ||||||
| * | | added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh ↵ | UbitUmarov | 2012-02-26 | 2 | -3/+41 | |
| | | | | | | | | | | | | data. | |||||
| * | | replace bad meshs by a small cube and log it. | UbitUmarov | 2012-02-24 | 1 | -5/+21 | |
| | | | ||||||
| * | | stop using useless geom tricallback. | UbitUmarov | 2012-02-24 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-02-24 | 1 | -0/+2 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | Stop spurious scene loop startup timeout alarms for scenes with many prims. | Justin Clark-Casey (justincc) | 2012-02-24 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout. | |||||
* | | fix the last fix. Regions are square but... Also remove the 0.5 offset in ↵ | UbitUmarov | 2012-02-23 | 1 | -1/+3 | |
| | | | | | | | | map position. It was apparently needed to fix we having nsamples = size and not size + 1. | |||||
* | | fix my bug on ChODE terrain heightmap build | UbitUmarov | 2012-02-23 | 1 | -3/+3 | |
| | | ||||||
* | | Reverse the changed to ODE heightmap. It results in SERIOUS issues like an | Melanie | 2012-02-21 | 1 | -4/+4 | |
| | | | | | | | | irreversible y-flip and holes in the map. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 6 | -939/+4 | |
|\ \ | |/ | | | | | Conflicts: | |||||
| * | Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate. | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+3 | |
| | | | | | | | | | | This uses the same approach as ODE. radams, if this doesn't work for you please feel free to revert. | |||||
| * | Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process. | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -14/+1 | |
| | | ||||||
| * | Remove PhysXPlugin and wrappers. | Justin Clark-Casey (justincc) | 2012-02-21 | 5 | -1001/+0 | |
| | | | | | | | | | | In over 4 years this never progressed beyond an unimplemented stub. This doesn't mean that it can't come back if someone is interested in implementing PhysX support. | |||||
* | | Merge branch 'ubitwork' | Melanie | 2012-02-19 | 18 | -1071/+12694 | |
|\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | |||||
| * | | minor fix to chODE terrain heighmap scale | UbitUmarov | 2012-02-19 | 1 | -4/+4 | |
| | | | ||||||
| * | | changed how vehicle data is stored and passed to physics. use unsafe in ↵ | UbitUmarov | 2012-02-18 | 4 | -59/+347 | |
| | | | | | | | | | | | | serializer, tried to control m_dupeInProgress | |||||
| * | | Added simple binary serializer/deserializer to chODE. 100% untested and most ↵ | UbitUmarov | 2012-02-17 | 5 | -1035/+1540 | |
| | | | | | | | | | | | | like still broken | |||||
| * | | Now if chode prim.cs detects out of bounds it requests a update and blocks ↵ | UbitUmarov | 2012-02-15 | 2 | -20/+45 | |
| | | | | | | | | | | | | movement and colisions. Base code must do a PhysActor.CrossingFailure() to make it move again inside sim or delete it. | |||||
| * | | don't freeze with a sitted avatar in a border without other sim. Still messy :( | UbitUmarov | 2012-02-15 | 1 | -2/+2 | |
| | | |