Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into vehicles | Melanie | 2009-10-22 | 1 | -0/+10 |
|\ | |||||
| * | Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim ↵ | John Hurliman | 2009-10-19 | 1 | -0/+4 |
| |\ | | | | | | | | | | into prioritization | ||||
| | * | Forgot {} on last commit. | Diva Canto | 2009-10-19 | 1 | -0/+2 |
| | | | |||||
| | * | More instrumentation in physics. | Diva Canto | 2009-10-19 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵ | John Hurliman | 2009-10-19 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | | | | prioritization | ||||
| * | | A bit of instrumentation to figure out what's going on with physics actors. | Diva Canto | 2009-10-18 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'master' into vehicles | Melanie | 2009-10-19 | 1 | -1/+22 |
|\ \ \ | | |/ | |/| | |||||
| * | | Formatting cleanup. | Jeff Ames | 2009-10-19 | 1 | -1/+1 |
| |/ | |||||
| * | * One more attempt at the NullRef In The OdePlugin. This might fix it, but ↵ | Teravus Ovares (Dan Olivares) | 2009-10-16 | 1 | -0/+21 |
| | | | | | | | | it will definitely get us closer to the root cause. | ||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-12 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | * Make ODECharacter respect the scene's requested collision update time | Teravus Ovares (Dan Olivares) | 2009-10-10 | 1 | -0/+1 |
| | | | | | | | | * 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-01 | 1 | -11/+3 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -5/+5 |
| | | |||||
* | | Commit initial version of KittoFlora's vehicle changes | opensim | 2009-09-30 | 1 | -16/+38 |
|/ | |||||
* | 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 |
| | |||||
* | * One last attempt to get the bordercrossing/primcrossing/attachmentcrossing ↵ | Teravus Ovares (Dan Olivares) | 2009-09-02 | 1 | -1/+72 |
| | | | | | | 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 | 1 | -5/+5 |
| | | | | and idle performance. | ||||
* | * 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 | 1 | -65/+133 |
| | |||||
* | *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 | 1 | -47/+54 |
| | | |||||
* | | 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 | 1 | -0/+9 |
|/ | |||||
* | * Fix one physics crash for regions larger then 512mx512m | Teravus Ovares (Dan Olivares) | 2009-08-08 | 1 | -1/+4 |
| | |||||
* | * Remove hard coded 256 limitations from various places. There's no more ↵ | Teravus Ovares (Dan Olivares) | 2009-08-07 | 1 | -9/+38 |
| | | | | 256m limitation within the OpenSimulator framework, however, the LLClient ClientView does not support regions larger then 256 meters so, if you try and make your region larger by setting Constants.RegionSize = 512; in OpenSim.Framework.Constants.cs, the terrain will not display on clients using the LLUDP protocol | ||||
* | * Remove some mono compiler warnings | Justin Clark-Casey | 2009-08-05 | 1 | -1/+2 |
| | |||||
* | * Whoops, forgot the water heightfield. | Teravus Ovares | 2009-07-22 | 1 | -1/+1 |
| | |||||
* | * Exclude heightfield geom from the raycast test. | Teravus Ovares | 2009-07-22 | 1 | -1/+1 |
| | | | | | * Fixes mantis #3922 | ||||
* | * nothing in this commit, re-triggering panda.. which crashed while testing. | Teravus Ovares | 2009-07-21 | 1 | -1/+1 |
| | |||||
* | * Fixed a case where a prim was a NullPhysicsActor instead of an OdePrim | Teravus Ovares | 2009-07-21 | 1 | -72/+100 |
| | | | | | | * Commented logic that wasn't being used. * This should fix the errors in OdeScene.near | ||||
* | * Created a way that the OpenSimulator scene can ask the physics scene to do ↵ | Teravus Ovares | 2009-07-19 | 1 | -1/+22 |
| | | | | | | | | | a raycast test safely. * Test for prim obstructions between the avatar and camera. If there are obstructions, inform the client to move the camera closer. This makes it so that walls and objects don't obstruct your view while you're moving around. Try walking inside a hollowed tori. You'll see how much easier it is now because your camera automatically moves closer so you can still see. * Created a way to know if the user's camera is alt + cammed or just following the avatar. * Changes IClientAPI interface by adding SendCameraConstraint(Vector4 CameraConstraint) | ||||
* | Experimental fix for tilted avatar capsule, Mantis #2905 | nlin | 2009-07-08 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | Set av_capsule_tilted to false in opensim.ini. Default is true, so there is no change in avatar behavior (and no breaking of existing content which relies on the tilted capsule). This commit straightens up the avatar capsule so it behaves consistently (e.g. same collision behavior against prims regardless of which direction the avatar is coming from; ability to fit through narrow doorways). Please note this introduces other side effects which have not been fixed. In particular: * The avatar frequently falls through the terrain if it is not flat, though the avatar behaves pretty well on flat terrain. This requires investigation of the ode terrain collider. * The apparent foot position of the avatar with respect to the ground is changed. This requires investigation of the avatar height/capsule height. Please consider this as work in progress. | ||||
* | - fixes a "collection out of sync" exception in the ODE physics | Dr Scofield | 2009-06-25 | 1 | -33/+44 |
| | | | | | | | engine, caused by an "avatar infinite position" occurring under heavy load. - fixes "value too small" exception in ChatModule | ||||
* | From: Alan Webb <alan_webb@us.ibm.com> | Dr Scofield | 2009-06-10 | 1 | -2/+2 |
| | | | | | | | | Eat collision errors --- NOTE: this fix might be naive, it seems to have helped us getting to 81 avatars (whereas we'd crash with 20 before), but it sure would benefit from some check-over by a person skilled in the art of ODE physics. | ||||
* | Formatting cleanup. | Jeff Ames | 2009-06-10 | 1 | -1/+1 |
| | |||||
* | cleaning out warnings. | Dr Scofield | 2009-05-22 | 1 | -1/+1 |
| | | | | | | NOTE: we currently have a gazillion warnings caused stuff flagged as "obsolete" (OGS1 stuff) --- what's up with that? | ||||
* | * Allow passing of material type to physics engine | Teravus Ovares | 2009-04-20 | 1 | -19/+241 |
| | | | | | * Define low friction and medium bounce for Glass | ||||
* | Added a "force_simple_prim_meshing" option to the ODE settings in ↵ | Dahlia Trimble | 2009-04-19 | 1 | -25/+18 |
| | | | | | | | OpenSim.ini which will use meshes for collisions with simple prim shapes rather than internal ODE algorithms. This may help with Mantis #2905 and Mantis #3487 for those experimenting with capsule settings. Note that this will increase memory usage and region startup time. | ||||
* | From: Alan M Webb <alan_webb@us.ibm.com> | Dr Scofield | 2009-03-31 | 1 | -1/+9 |
| | | | | | | | Add sanity check to fly-height calculation so that it does not attempt to retrieve information from non-existent regions. | ||||
* | * Fixing thread safety of avatar adding and removing from the Physics Scene ↵ | Teravus Ovares | 2009-03-30 | 1 | -6/+25 |
| | | | | | | | in the ODEPlugin * This may help one of the symptoms or mantis 3363 , however it probably won't solve the occasional NonFinite Avatar Position detected.. issues that some people see. That is probably an entirely different issue(NaN). | ||||
* | * Make all coded defaults match settings in OpenSim.ini.example | Justin Clarke Casey | 2009-03-11 | 1 | -4/+4 |
| | | | | | | | * In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using * OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before) |