Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make vehicles retain velocity when crossing between regions. | Melanie | 2012-02-20 | 1 | -0/+4 |
| | |||||
* | Add an override to make SOG.Velocity work as expected | Melanie | 2012-02-20 | 1 | -0/+6 |
| | |||||
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-19 | 4 | -18/+29 |
|\ | |||||
| * | Merge branch 'master' into careminster | Melanie | 2012-02-19 | 4 | -18/+29 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-02-19 | 3 | -10/+11 |
| | |\ | |||||
| | | * | Use localy defined name, TPFlags, for Constants.TeleportFlags | BlueWall | 2012-02-19 | 1 | -6/+6 |
| | | | | |||||
| | * | | A few more tweaks on position updates and create child agents. Mono hates ↵ | Diva Canto | 2012-02-19 | 3 | -11/+23 |
| | | | | | | | | | | | | | | | | concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours. | ||||
* | | | | Uncomment serialization | Melanie | 2012-02-19 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'ubitwork' | Melanie | 2012-02-19 | 3 | -4/+300 |
|\ \ \ \ | |||||
| * | | | | simplified vehicle fromXml. Use still comented on SceneObjectSerialized.cs | UbitUmarov | 2012-02-19 | 1 | -77/+117 |
| | | | | | |||||
| * | | | | Vehicle XML serialization more complete. Inactived by coments in ↵ | UbitUmarov | 2012-02-19 | 3 | -4/+260 |
| | | | | | | | | | | | | | | | | | | | | SceneObjectSerializar.cs until proper testing | ||||
* | | | | | Merge branch 'ubitwork' | Melanie | 2012-02-19 | 24 | -1098/+13331 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | ||||
| * | | | | moved vehicle from SOG to SOP | UbitUmarov | 2012-02-19 | 3 | -104/+79 |
| | | | | | |||||
| * | | | | minor fix to chODE terrain heighmap scale | UbitUmarov | 2012-02-19 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | missing paramenters init plus some cleaning | UbitUmarov | 2012-02-18 | 1 | -91/+16 |
| | | | | | |||||
| * | | | | added a EnUsCulture whatever that is.. | UbitUmarov | 2012-02-18 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | a bit less human readable xml | UbitUmarov | 2012-02-18 | 1 | -25/+25 |
| | | | | | |||||
| * | | | | added some ToXml2 to SOGVehicle ( unused untested ) | UbitUmarov | 2012-02-18 | 1 | -1/+84 |
| | | | | | |||||
| * | | | | changed how vehicle data is stored and passed to physics. use unsafe in ↵ | UbitUmarov | 2012-02-18 | 6 | -222/+522 |
| | | | | | | | | | | | | | | | | | | | | serializer, tried to control m_dupeInProgress | ||||
| * | | | | vehicle parameters do cross (i hope) on regions in same instance ( others ↵ | UbitUmarov | 2012-02-18 | 2 | -13/+57 |
| | | | | | | | | | | | | | | | | | | | | need xml) | ||||
| * | | | | let SOG know about vehicles. Still needs serialization and applyphyscis on ↵ | UbitUmarov | 2012-02-18 | 3 | -30/+541 |
| | | | | | | | | | | | | | | | | | | | | deserialize, etc | ||||
| * | | | | 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 | 2 | -3/+10 |
| | | | | | |||||
| * | | | | try to make crossings work better. chode no longer prevents crossings i hope | UbitUmarov | 2012-02-15 | 4 | -27/+77 |
| | | | | | |||||
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-15 | 28 | -534/+1225 |
| |\ \ \ \ | |||||
| * | | | | | 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 |
| | | | | | | |||||
| * | | | | | scenepresence change! in standup() give avatar a physical actor after ↵ | UbitUmarov | 2012-02-11 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | deciding the new position. This reduces a bit the odds of it being still coliding with object. | ||||
| * | | | | | 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 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-10 | 17 | -34/+309 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: prebuild.xml | ||||
| * | | | | | | 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 | 5 | -11/+60 |
| | | | | | | | |||||
| * | | | | | | first change in SOP. in AddPrimShape(..) give physics the world rotation and ↵ | UbitUmarov | 2012-02-08 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | not local offset. Currently physics interface only knows about world frame | ||||
| * | | | | | | 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 | 31 | -90/+688 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-19 | 4 | -6/+45 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Fix:Fly setting for Parcel dosen't work ↵ | PixelTomsen | 2012-02-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5887 Signed-off-by: nebadon <michael@osgrid.org> | ||||
| | * | | | | | Fix:OmegaX, OmegaY and OmegaZ not saved for child prims ↵ | PixelTomsen | 2012-02-19 | 1 | -3/+3 |
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5893 Signed-off-by: nebadon <michael@osgrid.org> | ||||
| | * | | | | This should smooth movement in heteregeneous networks by a lot: cache the ↵ | Diva Canto | 2012-02-18 | 2 | -2/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | region by position instead of looking it up all the time -- this was being done during the main update loop! | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 22 | -70/+556 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | ||||
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-02-18 | 1 | -1/+4 |
| | |\ \ \ \ |