Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | try to make crossings work better. chode no longer prevents crossings i hope | UbitUmarov | 2012-02-15 | 1 | -6/+50 |
| | | | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-15 | 2 | -1/+53 |
| |\ \ | |||||
| * | | | remove drawstuff from ubitode | UbitUmarov | 2012-02-11 | 4 | -256/+1 |
| | | | | |||||
| * | | | removed outdated coments. | UbitUmarov | 2012-02-11 | 1 | -630/+0 |
| | | | | |||||
| * | | | remove forgotten taints code | UbitUmarov | 2012-02-11 | 1 | -32/+0 |
| | | | | |||||
| * | | | UbitODE: replace 'taints' by 'changes' for avatars also. This provides ↵ | UbitUmarov | 2012-02-11 | 3 | -250/+378 |
| | | | | | | | | | | | | | | | | better time order with changes in prims. | ||||
| * | | | vehicle changes done by simulation thread and not calling one | UbitUmarov | 2012-02-11 | 2 | -132/+200 |
| | | | | |||||
| * | | | changes to vehicle banking | UbitUmarov | 2012-02-11 | 1 | -69/+23 |
| | | | | |||||
| * | | | a bit better vertical attractor and banking | UbitUmarov | 2012-02-11 | 1 | -12/+23 |
| | | | | |||||
| * | | | Use mesh to estimate real center of prims if avaiable. Let sculpt map ↵ | UbitUmarov | 2012-02-11 | 5 | -33/+129 |
| | | | | | | | | | | | | | | | | textures with alpha channel work. On linux J2DecodeCache folder must be deleted to remove bad entries. Corrently this can't be cached on linux (mono/ cairo/? problem) | ||||
| * | | | scale avatar push force with avatar density | UbitUmarov | 2012-02-11 | 1 | -1/+2 |
| | | | | |||||
| * | | | test on git | UbitUmarov | 2012-02-10 | 4 | -0/+4 |
| | | | | |||||
| * | | | Changes to vehicles code etc. Includes some debug aids to remove later. | UbitUmarov | 2012-02-10 | 4 | -243/+145 |
| | | | | |||||
| * | | | initial introdution of physics actor building control. | UbitUmarov | 2012-02-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | changes in physics manager, needed for UbitODE | UbitUmarov | 2012-02-08 | 2 | -1/+28 |
| | | | | |||||
| * | | | UbitODE plugin initial commit | UbitUmarov | 2012-02-08 | 10 | -0/+11556 |
| | | | | |||||
* | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-19 | 3 | -5/+29 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 3 | -5/+29 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | ||||
| | * | | Report an error if the required native Windows ODE library can't be found. | Justin Clark-Casey (justincc) | 2012-02-18 | 1 | -1/+4 |
| | | | | |||||
| | * | | On Windows automatically load the correct native ODE library depending on ↵ | Justin Clark-Casey (justincc) | 2012-02-18 | 2 | -3/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works. | ||||
| | * | | Comment out "experimental" log message printed out whenever a physics mesh ↵ | Justin Clark-Casey (justincc) | 2012-02-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | was generated for a mesh Also adds prim name to the "no asset data" error log message | ||||
* | | | | 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 |
| | | | | |||||
* | | | | try to make crossings work better. chode no longer prevents crossings i hope | UbitUmarov | 2012-02-15 | 1 | -6/+50 |
|/ / / | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-02-15 | 2 | -1/+53 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | correct the default avatar_terminal_velocity value that I accidentally left ↵ | Justin Clark-Casey (justincc) | 2012-02-11 | 1 | -1/+1 |
| | | | | | | | | in whilst testing | ||||
| * | Clamp ODE character velocity. Make ODE falling character 54m/s by default. | Justin Clark-Casey (justincc) | 2012-02-11 | 2 | -1/+53 |
| | | | | | | | | | | | | | | If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value. In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver. This also appears to be the value used on the linden lab grid. This should resolve http://opensimulator.org/mantis/view.php?id=5882 | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 4 | -7/+63 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Update BulletSim.dll with some interface changes and tuning (see ↵ | Robert Adams | 2012-01-25 | 2 | -6/+31 |
| | | | | | | | | opensim-libs). Change BSScene to use new interface. | ||||
| * | Serialize calls to ODE Collide() function across OdeScene instances to ↵ | Justin Clark-Casey (justincc) | 2012-01-25 | 2 | -1/+32 |
| | | | | | | | | | | | | | | | | | | prevent ODE crashes on simulators running more than one region. It turns out that calls to Collide() are not thread-safe even for objects in different ODE physics worlds due to ODE static caches. For simulators running multiple regions, not serializing calls from different scene loops will sooner or later cause OpenSim to crash with a native stack trace referencing OBBCollider. This affects the default OPCODE collider but not GIMPACT. However, GIMPACT fails for other reasons under some current simulator loads. ODE provides a thread local storage option, but as of ODE r1755 (and r1840) DLLs compiled with this crash OpenSim immediately. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 2 | -12/+27 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | Restrict accessible of ODECharacter Shell and Body. Add method doc and some ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 2 | -12/+27 |
| | | | | | | | | error log lines. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs | ||||
| * | Adding commented out log messages and some minor formatting for future bug ↵ | Justin Clark-Casey (justincc) | 2012-01-02 | 1 | -0/+1 |
| | | | | | | | | hunting. No functional changes. | ||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2011-12-24 | 1 | -2/+2 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2011-12-23 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Align default ODE_STEPSIZE with that already used through OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2011-12-22 | 1 | -2/+2 |
| | | | |||||
* | | | Add setter for Acceleration on physics objects. | Melanie | 2011-12-24 | 2 | -0/+2 |
|/ / | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 10 | -34/+13 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs |