aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-212-35/+5
|\
| * Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-212-30/+4
| * Revert "Fix:Cannot drag inventory from child prim into inventory http://opens...Justin Clark-Casey (justincc)2012-02-211-8/+4
* | Reverse the changed to ODE heightmap. It results in SERIOUS issues like anMelanie2012-02-211-4/+4
* | Merge branch 'master' into careminsterMelanie2012-02-211-4/+8
|\ \ | |/
| * Fix:Cannot drag inventory from child prim into inventory http://opensimulator...PixelTomsen2012-02-211-4/+8
* | Also preserve angular velocity on crossing.Melanie2012-02-211-0/+3
* | Merge branch 'master' into careminsterMelanie2012-02-2115-954/+68
|\ \ | |/
| * Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.Justin Clark-Casey (justincc)2012-02-211-0/+3
| * Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-219-14/+51
| * Fix bug where NPCs would establish child agents on other neighbour regions th...Justin Clark-Casey (justincc)2012-02-211-15/+14
| * Remove PhysXPlugin and wrappers.Justin Clark-Casey (justincc)2012-02-215-1001/+0
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-204-13/+23
|\ \
| * \ 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, blackli...Diva Canto2012-02-202-11/+16
| | * 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
* | | Make vehicles retain velocity when crossing between regions.Melanie2012-02-201-0/+4
* | | Add an override to make SOG.Velocity work as expectedMelanie2012-02-201-0/+6
|/ /
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-194-18/+29
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-194-18/+29
| |\ \ | | |/
| | * 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 con...Diva Canto2012-02-193-11/+23
* | | | 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 SceneObjectS...UbitUmarov2012-02-193-4/+260
* | | | | Merge branch 'ubitwork'Melanie2012-02-1924-1098/+13331
|\ \ \ \ \ | |/ / / /
| * | | | 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 seria...UbitUmarov2012-02-186-222/+522
| * | | | vehicle parameters do cross (i hope) on regions in same instance ( others ne...UbitUmarov2012-02-182-13/+57
| * | | | let SOG know about vehicles. Still needs serialization and applyphyscis on d...UbitUmarov2012-02-183-30/+541
| * | | | Added simple binary serializer/deserializer to chODE. 100% untested and most ...UbitUmarov2012-02-175-1035/+1540
| * | | | Now if chode prim.cs detects out of bounds it requests a update and blocks mo...UbitUmarov2012-02-152-20/+45
| * | | | 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 decidin...UbitUmarov2012-02-111-0/+10
| * | | | | UbitODE: replace 'taints' by 'changes' for avatars also. This provides better...UbitUmarov2012-02-113-250/+378
| * | | | | vehicle changes done by simulation thread and not calling oneUbitUmarov2012-02-112-132/+200