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 | 1 | -4/+8 |
|\ | |||||
| * | Fix:Cannot drag inventory from child prim into inventory ↵ | PixelTomsen | 2012-02-21 | 1 | -4/+8 |
| | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569 | ||||
* | | Also preserve angular velocity on crossing. | Melanie | 2012-02-21 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 7 | -954/+18 |
|\ \ | |/ | | | | | 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 |
| | | |||||
| * | Fix bug where NPCs would establish child agents on other neighbour regions ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -15/+14 |
| | | | | | | | | that had come up after the NPC was created. | ||||
| * | 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 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-20 | 3 | -7/+6 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2012-02-20 | 3 | -7/+6 |
| |\ \ | | |/ | |||||
| | * | More improvements on agent position updates: if the target sims fail, ↵ | Diva Canto | 2012-02-20 | 1 | -5/+2 |
| | | | | | | | | | | | | 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 Canto | 2012-02-19 | 1 | -1/+3 |
| | | | |||||
| | * | Amend to last commit. This should have been committed too. | Diva Canto | 2012-02-19 | 1 | -1/+1 |
| | | | |||||
* | | | 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 | 19 | -218/+460 |
| |\ \ \ \ | |||||
| * | | | | | 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 |
| | | | | | |