Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-12 | 2 | -2/+17 | |
|\ \ | |/ | ||||||
| * | * comment out the velocity test, using updates every 500 ms as set in ↵ | Teravus Ovares (Dan Olivares) | 2009-10-10 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | ScenePresence.AddToPhysicalScene. * This causes time to be counted in ODECharacter and, when a collision occurs, the physics scene will report the collisions only if the the difference of last time it reported the collisions from now was more then the set ms. * This is cool because the time accrues while collisions are not taking place and when they do take place again, you get an immediate update. | |||||
| * | * Make ODECharacter respect the scene's requested collision update time | Teravus Ovares (Dan Olivares) | 2009-10-10 | 2 | -2/+14 | |
| | | | | | | | | * Set the Scene collision update time to 500 ms | |||||
* | | Correct a build break caused by an optimization in trunk | Melanie | 2009-10-07 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-06 | 1 | -5/+2 | |
|\ \ | |/ | ||||||
| * | minor: remove mono compile warning | Justin Clark-Casey (justincc) | 2009-10-05 | 1 | -5/+2 | |
| | | ||||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-05 | 4 | -69/+124 | |
|\ \ | |/ | ||||||
| * | Eliminate pinned Mesh data on managed heap by using IntPtrs to memory ↵ | Dan Lake | 2009-10-05 | 3 | -61/+120 | |
| | | | | | | | | allocated on the unmanaged heap. This prevents fragmentation of the managed heap and the resulting stress on GC. A region with ~150,000 prims using ODE and Meshmerizer saw memory remain flat around 1.2GB as opposed to 1.5GB and continually growing due to pinned memory. This patch complements the unique mesh dictionary patch applied to Meshmerizer but is independent. The net effect is a 60-75% reduction in memory for our largest regions. | |||||
| * | only cache mesh if meshing was successful | dahlia | 2009-10-04 | 1 | -8/+4 | |
| | | | | | | | | re-enable sculpt mesh caching | |||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-05 | 1 | -7/+24 | |
|\ \ | |/ | ||||||
| * | flexible extrusion shape defaults to linear | dahlia | 2009-10-04 | 1 | -1/+1 | |
| | | ||||||
| * | Exclude sculpt proxies from mesh caching | dahlia | 2009-10-04 | 1 | -6/+23 | |
| | | ||||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-02 | 1 | -0/+14 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' into diva-textures | Melanie | 2009-10-02 | 13 | -263/+341 | |
| |\ | ||||||
| * | | Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there. | Diva Canto | 2009-09-30 | 1 | -0/+14 | |
| | | | ||||||
* | | | Merge branch 'master' into vehicles | Melanie | 2009-10-01 | 8 | -20/+12 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -2/+2 | |
| | | | ||||||
| * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 5 | -10/+10 | |
| | | | ||||||
| * | | Add copyright header. Formatting cleanup. | Jeff Ames | 2009-09-29 | 2 | -2/+2 | |
| | | | ||||||
* | | | Merge branch '0.6.7-post-fixes' into vehicles | Kitto Flora | 2009-09-30 | 6 | -191/+257 | |
|\ \ \ | |/ / | ||||||
| * | | corrections to viewerMode AddPos() | dahlia | 2009-09-25 | 2 | -1/+40 | |
| | | | ||||||
| * | | Meshmerizer stores dictionary of unique Meshes keyed on construction ↵ | Dan Lake | 2009-09-24 | 3 | -78/+95 | |
| | | | | | | | | | | | | | | | | | | parameters. CreateMesh() returns a Mesh from the dictionary or creates a new Mesh if it has not been created before. Meshes are never purged from the dictionary. The raw Mesh data is discarded once the memory is pinned for ODE use. All copies of the same prim/mesh use the same pinned memory. ONLY IMPLEMENTED AND TESTED WITH MESHMERIZER AND ODE Signed-off-by: dahlia <dahliaTrimble@gmailDotCom> | |||||
| * | | modify BulletDotNETPrim.cs in preparation for Mantis #4181 | dahlia | 2009-09-24 | 1 | -112/+122 | |
| | | | ||||||
* | | | Commit initial version of KittoFlora's vehicle changes | opensim | 2009-09-30 | 4 | -564/+1300 | |
|/ / | ||||||
* | | Alternate algorithm for fixing avatar capsule tilt (Mantis #2905) | nlin | 2009-09-18 | 1 | -60/+72 | |
|/ | | | | | | | | | | | | | Eliminate dynamic capsule wobble. Instead introduce a small, fixed tilt, and allow the tilt to rotate with the avatar while moving; the tilt always faces away from the direction of avatar movement. The rotation while moving should eliminate direction-dependent behavior (e.g. only being able to climb on top of prims from certain directions). Falling animation is still too frequently invoked. Ideally the tilt should be completely eliminated, but doing so currently causes the avatar to fall through the terrain. | |||||
* | Add test to check behaviour if an iar is loaded where no user profile exists ↵ | Justin Clark-Casey (justincc) | 2009-09-09 | 1 | -16/+6 | |
| | | | | | | for the creators Disable generation of temporary profiles for now, instead record loading user as creator | |||||
* | * Fix for GetTerrainHeightAtXY to make it compatible when ↵ | Teravus Ovares (Dan Olivares) | 2009-09-04 | 1 | -3/+4 | |
| | | | | Constants.RegionSize isn't 256 | |||||
* | * Fixes the function 'GetTerrainHeightAtXY' | Teravus Ovares (Dan Olivares) | 2009-09-04 | 1 | -16/+26 | |
| | ||||||
* | eliminate unnecessary storage of mesh objects which are no longer necessary ↵ | dahlia | 2009-09-02 | 1 | -1/+0 | |
| | | | | after recent startup optimizations | |||||
* | Add copyright headers. Formatting cleanup. | Jeff Ames | 2009-09-03 | 1 | -2/+2 | |
| | ||||||
* | * One last attempt to get the bordercrossing/primcrossing/attachmentcrossing ↵ | Teravus Ovares (Dan Olivares) | 2009-09-02 | 2 | -1/+77 | |
| | | | | | | right in the new border framework. * This also contains some inactive preliminary code for disconnecting combined regions that will be used to make one root region a virtual region of a new root region. | |||||
* | Thank you, dslake, for a set of patches to improve OpenSim startup | Melanie | 2009-09-02 | 3 | -5/+15 | |
| | | | | and idle performance. | |||||
* | Applying Mantis #4079. Thank you, dslake | Melanie | 2009-09-01 | 2 | -109/+57 | |
| | ||||||
* | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-26 | 5 | -16/+14 | |
|\ | ||||||
| * | Add copy constructor to PhysicsVector. | Jeff Ames | 2009-08-26 | 1 | -0/+5 | |
| | | ||||||
| * | Formatting cleanup, minor refactoring. | Jeff Ames | 2009-08-26 | 4 | -16/+9 | |
| | | ||||||
* | | * It turns out that Physics heightmap values were being stored in managed ↵ | Teravus Ovares (Dan Olivares) | 2009-08-21 | 1 | -22/+27 | |
| | | | | | | | | memory in _heightmap and using multiple heightmaps caused them all to overwrite each other and the last one was the heightmap for all of the regions. This fixes that. It also reduces the terrain resolution to half. | |||||
* | | * Fixes Terrain issues with combined regions. | Teravus Ovares (Dan Olivares) | 2009-08-20 | 2 | -74/+137 | |
| | | ||||||
* | | *remove conflicts | Teravus Ovares (Dan Olivares) | 2009-08-18 | 1 | -9/+4 | |
|\ \ | |/ | ||||||
| * | Did I say that i don't like git? Remove some stuff that shouldn't have | Melanie | 2009-08-17 | 1 | -30/+8 | |
| | | | | | | | | gone in. | |||||
| * | Add System.Xml reference to the console project | Melanie | 2009-08-17 | 1 | -8/+30 | |
| | | ||||||
| * | Misc cleanup. | Jeff Ames | 2009-08-16 | 1 | -9/+4 | |
| | | ||||||
* | | * Some Physics Scene Changes to prepare for larger regions | Teravus Ovares (Dan Olivares) | 2009-08-18 | 4 | -52/+59 | |
| | | ||||||
* | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-15 | 1 | -6/+4 | |
|\ \ | |/ | ||||||
| * | Formatting cleanup. Fix some compiler warnings. | Jeff Ames | 2009-08-13 | 1 | -6/+4 | |
| | | ||||||
* | | * part one of adding physics combining | Teravus Ovares (Dan Olivares) | 2009-08-15 | 2 | -0/+19 | |
|/ | ||||||
* | Minor: formatting cleanup. | Jeff Ames | 2009-08-11 | 1 | -6/+4 | |
| | ||||||
* | Split BasicPhysics classes into separate files. | Jeff Ames | 2009-08-11 | 3 | -415/+508 | |
| | ||||||
* | * Fix one physics crash for regions larger then 512mx512m | Teravus Ovares (Dan Olivares) | 2009-08-08 | 1 | -1/+4 | |
| | ||||||
* | This is the second part of the 'not crash on regionsize changes'. This ↵ | Teravus Ovares (Dan Olivares) | 2009-08-07 | 5 | -7/+7 | |
| | | | | lets you configure region sizes to be smaller without crashing the region. I remind you that regions are still square, must be a multiple of 4, and the Linden client doesn't like anything other then 256. If you set it bigger or smaller, the terrain doesn't load in the client, the map has issues, and god forbid you connect it to a grid that expects 256m regions. |