Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 2 | -5/+21 |
|\ | |||||
| * | Allow physics proxy generation for meshes using new asset format. | dahlia | 2011-06-29 | 2 | -5/+21 |
| | | | | | | | | Fix an invalid cast exception while decoding new mesh asset format. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-20 | 2 | -1/+21 |
|\ \ | |/ | |||||
| * | Add localID to physical object creation functions. | Mic Bowman | 2011-06-15 | 2 | -1/+21 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-11 | 1 | -1/+5 |
|\ \ | |/ | |||||
| * | partial update for new mesh asset format - handle both old and new formats ↵ | dahlia | 2011-06-10 | 1 | -1/+5 |
| | | | | | | | | for physics mesh | ||||
* | | Implement llGodLikeRezObject and llGetUsedMemory | Melanie | 2011-05-22 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Fix crash when [Mesh] section is missing from configuration files | Dan Lake | 2011-04-29 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-21 | 1 | -3/+10 |
| |\ | |||||
| * | | Group collada meshies settings under [Mesh] in OpensimDefaults.ini | BlueWall | 2011-04-21 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -3/+10 |
|\ \ \ | | |/ | |/| | |||||
| * | | fix meshing failure on sculpt maps smaller than 64x64 | dahlia | 2011-04-19 | 1 | -3/+10 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 2 | -0/+6 |
|\ \ | |/ | |||||
| * | force mesh proxy for simple box prims with path cut | dahlia | 2011-04-12 | 2 | -0/+6 |
| | | |||||
* | | Comment a very spammy debug message that was being output directly to console. | Melanie | 2011-01-28 | 1 | -1/+1 |
| | | | | | | | | | | My last fox that makes bumping into sim borders/bans work makes this spam endlessly. | ||||
* | | Fix drift of static prim. | Kitto Flora | 2011-01-20 | 1 | -1/+13 |
| | | |||||
* | | Revise Materials properties; Fix Double-Click Autopilot; Allow non-script ↵ | Kitto Flora | 2011-01-04 | 2 | -227/+209 |
| | | | | | | | | sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message. | ||||
* | | Fix av/prim eject problem. | Kitto Flora | 2010-12-29 | 1 | -45/+60 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-25 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | This fixes mantis #5198 and related. Physics is not my expertise, so I'm not ↵ | Diva Canto | 2010-12-24 | 1 | -0/+5 |
| | | | | | | | | 100% sure of what all the consequences of this change are. Pushing up, so others can take a look. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 1 | -0/+19 |
|\ \ | |/ | |||||
| * | * Re-Adding Scene TimeDilation to Object Update Packets. | Teravus Ovares (Dan Olivares) | 2010-12-23 | 1 | -0/+19 |
| | | | | | | | | | | | | * Added Calculating Time Dilation in the OdePlubin * When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise. * Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent. | ||||
* | | Update materials parameters. | Kitto Flora | 2010-12-20 | 1 | -92/+108 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | minor: remove some compiler warnings | Justin Clark-Casey (justincc) | 2010-12-10 | 2 | -2/+2 |
| | | |||||
* | | Fix border fence for physicals. Fix llRotLookAt() for Vehicles. | Kitto Flora | 2010-12-11 | 2 | -153/+61 |
| | | |||||
* | | Fix spurious Av move when clothing item worn or removed. | Kitto Flora | 2010-12-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-25 | 1 | -2/+9 |
|\ \ | |/ | |||||
| * | catch an exception when a mesh asset header cant be decoded | dahlia | 2010-11-24 | 1 | -2/+9 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-25 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | * Updated libomv to r3461 | Latif Khalifa | 2010-10-24 | 1 | -2/+2 |
| | | | | | | | | Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -3/+4 |
|\ \ | |/ | |||||
| * | fix combining of multiple physics submeshes | dahlia | 2010-10-20 | 1 | -3/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-18 | 1 | -44/+87 |
|\ \ | |/ | |||||
| * | remove some cruft from last commit | dahlia | 2010-10-18 | 1 | -8/+0 |
| | | |||||
| * | initial support for meshies physics. Must set ini option ↵ | dahlia | 2010-10-18 | 1 | -43/+94 |
| | | | | | | | | UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 1 | -66/+141 |
|\ \ | |/ | |||||
| * | one more silly line ending thing.... *If you have problems, fetch the tree ↵ | Teravus Ovares (Dan Olivares) | 2010-10-15 | 1 | -71/+71 |
| | | | | | | | | | | | | and rebase. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| * | more work in progress on mesh physics - still non-functional | dahlia | 2010-10-14 | 1 | -2/+67 |
| | | |||||
| * | laying some groundwork for mesh physics | dahlia | 2010-10-14 | 1 | -70/+80 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-10 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | * Make line endings consistant in Meshmerizer.cs | Teravus Ovares (Dan Olivares) | 2010-10-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-09 | 1 | -1/+2 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| * | add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map ↵ | dahlia | 2010-10-07 | 1 | -1/+2 |
| | | | | | | | | caching for meshing | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-02 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Replace CalculateMass with a more accurate version, contributed by Ubit. | Melanie | 2010-10-02 | 1 | -234/+219 |
| | | | | | | | | Thank you. |