aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork'Melanie2012-02-1929-1105/+13371
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
| * moved vehicle from SOG to SOPUbitUmarov2012-02-193-104/+79
| |
| * minor fix to chODE terrain heighmap scaleUbitUmarov2012-02-191-4/+4
| |
| * missing paramenters init plus some cleaningUbitUmarov2012-02-181-91/+16
| |
| * added a EnUsCulture whatever that is..UbitUmarov2012-02-181-4/+3
| |
| * a bit less human readable xmlUbitUmarov2012-02-181-25/+25
| |
| * added some ToXml2 to SOGVehicle ( unused untested )UbitUmarov2012-02-181-1/+84
| |
| * changed how vehicle data is stored and passed to physics. use unsafe in ↵UbitUmarov2012-02-186-222/+522
| | | | | | | | serializer, tried to control m_dupeInProgress
| * vehicle parameters do cross (i hope) on regions in same instance ( others ↵UbitUmarov2012-02-182-13/+57
| | | | | | | | need xml)
| * let SOG know about vehicles. Still needs serialization and applyphyscis on ↵UbitUmarov2012-02-183-30/+541
| | | | | | | | deserialize, etc
| * Added simple binary serializer/deserializer to chODE. 100% untested and most ↵UbitUmarov2012-02-175-1035/+1540
| | | | | | | | like still broken
| * Now if chode prim.cs detects out of bounds it requests a update and blocks ↵UbitUmarov2012-02-152-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 :(UbitUmarov2012-02-152-3/+10
| |
| * try to make crossings work better. chode no longer prevents crossings i hopeUbitUmarov2012-02-154-27/+77
| |
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-1530-540/+1239
| |\
| * | remove drawstuff from ubitodeUbitUmarov2012-02-114-256/+1
| | |
| * | removed outdated coments.UbitUmarov2012-02-111-630/+0
| | |
| * | remove forgotten taints codeUbitUmarov2012-02-111-32/+0
| | |
| * | scenepresence change! in standup() give avatar a physical actor after ↵UbitUmarov2012-02-111-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 ↵UbitUmarov2012-02-113-250/+378
| | | | | | | | | | | | better time order with changes in prims.
| * | vehicle changes done by simulation thread and not calling oneUbitUmarov2012-02-112-132/+200
| | |
| * | changes to vehicle bankingUbitUmarov2012-02-111-69/+23
| | |
| * | a bit better vertical attractor and bankingUbitUmarov2012-02-111-12/+23
| | |
| * | Use mesh to estimate real center of prims if avaiable. Let sculpt map ↵UbitUmarov2012-02-115-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 densityUbitUmarov2012-02-111-1/+2
| | |
| * | revert project name to OpenSim and not CareminsterUbitUmarov2012-02-113-3/+3
| | |
| * | test on gitUbitUmarov2012-02-104-0/+4
| | |
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-1017-34/+309
| |\ \ | | | | | | | | | | | | | | | | Conflicts: prebuild.xml
| * | | Changes to vehicles code etc. Includes some debug aids to remove later.UbitUmarov2012-02-104-243/+145
| | | |
| * | | initial introdution of physics actor building control.UbitUmarov2012-02-085-11/+60
| | | |
| * | | first change in SOP. in AddPrimShape(..) give physics the world rotation and ↵UbitUmarov2012-02-081-2/+4
| | | | | | | | | | | | | | | | not local offset. Currently physics interface only knows about world frame
| * | | files need to run UbitODE in linux ( untested )UbitUmarov2012-02-083-0/+7
| | | |
| * | | changes needed to compile UbitODE, also changes project name to ↵UbitUmarov2012-02-083-4/+35
| | | | | | | | | | | | | | | | "Careminter". untested on linux
| * | | changes in physics manager, needed for UbitODEUbitUmarov2012-02-082-1/+28
| | | |
| * | | UbitODE plugin initial commitUbitUmarov2012-02-0810-0/+11556
| | | |
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-1933-90/+688
|\ \ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-02-194-6/+45
| |\ \ \ \
| | * | | | Fix:Fly setting for Parcel dosen't work ↵PixelTomsen2012-02-191-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 ↵PixelTomsen2012-02-191-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 Canto2012-02-182-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 careminsterMelanie2012-02-1824-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/opensimBlueWall2012-02-182-1/+4
| | |\ \ \ \
| | | * | | | Report an error if the required native Windows ODE library can't be found.Justin Clark-Casey (justincc)2012-02-181-1/+4
| | | | | | |
| | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-182-1/+10
| | | |\ \ \ \
| | | * | | | | Actually add the Windows 64-bit ode.dll file.Justin Clark-Casey (justincc)2012-02-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This might be why it didn't work.
| | * | | | | | Route logins according to Estate, Telehub and TeleportFlagsBlueWall2012-02-181-2/+4
| | | | | | | |
| | * | | | | | Propagate our teleport flags on loginsBlueWall2012-02-183-3/+12
| | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-02-176-7/+66
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix a bug where changing shape parameters of a child prim in a linkset would ↵Justin Clark-Casey (justincc)2012-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not persist. Resolves http://opensimulator.org/mantis/view.php?id=5819
| | | * | | | On Windows automatically load the correct native ODE library depending on ↵Justin Clark-Casey (justincc)2012-02-185-5/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.1 at 2024-12-14 20:22:30 +0000