aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-204-13/+23
|\
| * Amend to last commit: synchronize access to queues.Diva Canto2012-02-201-2/+5
| |
| * More improvements on agent position updates: if the target sims fail, ↵Diva Canto2012-02-202-11/+16
| | | | | | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail.
| * One more tweak related to the previous 2 commits.Diva Canto2012-02-191-1/+3
| |
| * Amend to last commit. This should have been committed too.Diva Canto2012-02-191-1/+1
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-194-18/+29
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-194-18/+29
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-02-193-10/+11
| | |\
| | | * Use localy defined name, TPFlags, for Constants.TeleportFlagsBlueWall2012-02-191-6/+6
| | | |
| | * | A few more tweaks on position updates and create child agents. Mono hates ↵Diva Canto2012-02-193-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 serializationMelanie2012-02-191-3/+3
| | | |
* | | | Merge branch 'ubitwork'Melanie2012-02-193-4/+300
|\ \ \ \
| * | | | simplified vehicle fromXml. Use still comented on SceneObjectSerialized.csUbitUmarov2012-02-191-77/+117
| | | | |
| * | | | Vehicle XML serialization more complete. Inactived by coments in ↵UbitUmarov2012-02-193-4/+260
| | | | | | | | | | | | | | | | | | | | SceneObjectSerializar.cs until proper testing
* | | | | Merge branch 'ubitwork'Melanie2012-02-1924-1098/+13331
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | 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-1528-534/+1225
| |\ \ \ \
| * | | | | 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
| | | | | |
| * | | | | 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
| * | | | | | 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-1931-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>
generated by cgit v1.1 at 2024-11-17 03:56:43 +0000