Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-12-13 | 7 | -71/+109 |
|\ | |||||
| * | BulletSim: fix problem of avatar's floating off the ground after unsitting. ↵ | Robert Adams | 2012-12-12 | 4 | -24/+27 |
| | | | | | | | | Reworked size/scale logic so physical scale is kept in Bullet and physObject scale is the preferred size -- usually same as size but avatars are computed differently. | ||||
| * | BulletSim: non-functional commenting and reorganization of material ↵ | Robert Adams | 2012-12-12 | 2 | -33/+49 |
| | | | | | | | | attribute specifications. | ||||
| * | BulletSim: updates and rearrangement of the TODO list. | Robert Adams | 2012-12-12 | 1 | -14/+33 |
| | | |||||
* | | Fix sounds so that they play from inventory after teleport rather than only ↵ | Justin Clark-Casey (justincc) | 2012-12-13 | 1 | -2/+2 |
|/ | | | | | | | | | on initial login region. Regression from commit ed162a10 (Fri Oct 5 13:50:12 2012) We had started listening for the client login event for attaching the sound trigger event rather than OnNewClient Addresses http://opensimulator.org/mantis/view.php?id=6453 Many thanks to danbanner for identifying the exact commit where this went wrong, which made identifying the fix easy. | ||||
* | Log situations where workitem event threads are aborted on stop request ↵ | Justin Clark-Casey (justincc) | 2012-12-12 | 1 | -3/+3 |
| | | | | | | because they failed to complete event processing within the given timeout. This is for bug hunting purposes where thread aborts may be causing dangling lock issues and subsequent vm crashes on mono (with ReaderWriterLockSlim, etc.) | ||||
* | Add "debug script log" command to allow setting a numeric debug level on ↵ | Justin Clark-Casey (justincc) | 2012-12-12 | 4 | -17/+113 |
| | | | | | | | individual IScriptInstances for debugging purposes. Current, state changes and event fires can be logged for individual scripts. See command help for more details. | ||||
* | Add asset id to "show script" and "show scripts" command output to make it ↵ | Justin Clark-Casey (justincc) | 2012-12-12 | 1 | -0/+1 |
| | | | | easier to extract and inspect the script's asset via "dump asset" | ||||
* | BulletSim: do not return the current velocity for targetVelocity. | Robert Adams | 2012-12-12 | 1 | -0/+11 |
| | |||||
* | BulletSim: fix crash caused by the creation of a linkset child that is under ↵ | Robert Adams | 2012-12-11 | 1 | -4/+4 |
| | | | | the terrain. Users can sure find some interesting corner conditions. | ||||
* | BulletSim: protect character property setting to remove crash from taints ↵ | Robert Adams | 2012-12-11 | 2 | -21/+42 |
| | | | | setting properties after the destroy character taint. | ||||
* | BulletSim: protect prim property setting to remove crash from taints setting ↵ | Robert Adams | 2012-12-11 | 3 | -20/+45 |
| | | | | properties after the destroy object taint has happened. | ||||
* | BulletSim: modify LIMIT_MOTOR_UP to limit BOAT types to be at water rather ↵ | Robert Adams | 2012-12-11 | 1 | -2/+2 |
| | | | | than ground level. This makes boats float at water level better but not perfectly. There probably needs to be some interaction between HOVER and LIMIT_MOTOR_UP. | ||||
* | BulletSim: add ini file and command line parameters to control | Robert Adams | 2012-12-11 | 4 | -8/+22 |
| | | | | | | | | | dumping of physical vehicle parameters (out of Bullet) on each simulation step and to optionally scale vehicle angular velocity by the time step. The latter looks to be part of a difference between angular parameters for ODE and BulletSim. SL docs say angular velocity is measured in radians/timeScale. Not sure if this is different than what ODE does. | ||||
* | BulletSim: set mass for single prim linksets when going physical. This fixes ↵ | Robert Adams | 2012-12-11 | 1 | -1/+8 |
| | | | | single prim vehicles not working (the surf board now zooms). | ||||
* | BulletSim: comment out some chatty debug logging. Rearrange some code in ↵ | Robert Adams | 2012-12-10 | 2 | -5/+7 |
| | | | | BSDynamics to make velocity vs force calculation clearer. | ||||
* | BulletSim: Fix crash on the destruction of physical linksets. | Robert Adams | 2012-12-10 | 12 | -38/+155 |
| | | | | | | | | | While fixing the above, add methods to physical body and shape pointer wrapper so routines won't have to know that IntPtr.Zero means no physical instance. Fix problem with physical linksets failing after a few sits and unsits by properly restoring child prom positions for compound linksets after multiple selection and deselections. | ||||
* | BulletSim: some comments about rebuilding linksets (having to recompute and ↵ | Robert Adams | 2012-12-09 | 1 | -3/+6 |
| | | | | restore a child's position in the world based on its position in the moved linkset). | ||||
* | BulletSim: adjust friction and restitution based on material type. | Robert Adams | 2012-12-09 | 2 | -5/+17 |
| | |||||
* | HGAssetMapper: Get wasn't really working. It's true that some assets are ↵ | Diva Canto | 2012-12-09 | 1 | -3/+35 |
| | | | | copied in the process of being gathered their UUID, but not all. Specifically, terminal assets like textures aren't copied. We have to go one more time through the ids. | ||||
* | Switched the order by which foreign inventory and foreign assets are brought ↵ | Diva Canto | 2012-12-09 | 1 | -6/+4 |
| | | | | in, to avoid race conditions on the client. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-12-09 | 4 | -17/+17 |
|\ | |||||
| * | Restrict IPresenceData.VerifyAgent | BlueWall | 2012-12-09 | 4 | -17/+17 |
| | | | | | | | | Restrict IPresenceData.VerifyAgent to only return bool result | ||||
* | | UserManagementModule: search the local cache for names too. | Diva Canto | 2012-12-09 | 2 | -1/+11 |
| | | | | | | | | Inventory transfers: don't do async on asset transfers or now. | ||||
* | | Replaced Mono.Addins dlls with ones compiled in Windows 64-bit. | Diva Canto | 2012-12-09 | 3 | -0/+0 |
|/ | |||||
* | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2012-12-08 | 7 | -91/+111 |
|\ | |||||
| * | Add back openjpeg dll for Windows | BlueWall | 2012-12-08 | 2 | -0/+0 |
| | | | | | | | | May generate some error output during startup on Robust - ignore for now, will fix soon. | ||||
| * | BulletSim: set material properties for static objects. Move ↵ | Robert Adams | 2012-12-08 | 2 | -11/+24 |
| | | | | | | | | Linkset.MakeStatic() after call to ForceActivationState2() since linkset might change activation state. Make BSPrim.CreateGeomAndObject public as linkset rebuilding might need access to it. Only rebuild prim if selection state is actually changes -- OpenSimulator calls PhysObject.Selected() multiple times whenever a prim is selected or deselected. | ||||
| * | BulletSim: fix small problem with setting size/scale of native shapes which ↵ | Robert Adams | 2012-12-08 | 1 | -6/+9 |
| | | | | | | | | caused the native shapes to be rebuilt when not necessary. | ||||
| * | BulletSim: update comments and add more to TODO list. | Robert Adams | 2012-12-08 | 2 | -4/+10 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-12-08 | 3 | -2/+3 |
| |\ | |||||
| * | | Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message ↵ | Justin Clark-Casey (justincc) | 2012-12-08 | 1 | -70/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to nominate a non-root destination folder. This is in relation to http://opensimulator.org/mantis/view.php?id=6311 This is after further analysis which shows the viewer expects the server to move the folder for #RLV give but then should be renaming the folder itself. For some reason this is not happening, possibly because we are not sending BulkUpdates or because we are not using transaction IDs properly. This needs to be fixed in the future. However, moving the folder even if the rename isn't correctly triggered in the viewer seems preferable to disabling this code altogether. | ||||
* | | | Add agent verification to Presence | BlueWall | 2012-12-08 | 4 | -0/+36 |
| |/ |/| | |||||
* | | Format change | BlueWall | 2012-12-07 | 1 | -1/+1 |
| | | | | | | | | Removed some white space in a line, looking to trigger a build | ||||
* | | One more time... | BlueWall | 2012-12-07 | 1 | -1/+1 |
| | | | | | | | | needed one more "../" in the path (copy paste): Thanks BrucePatton for catching that one | ||||
* | | Prebuild fix | BlueWall | 2012-12-07 | 2 | -1/+2 |
|/ | | | | Had moved the class to a different namespace but failed to add the reference | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-12-07 | 1 | -0/+5 |
|\ | |||||
| * | Added missing config var in grided sims. | Diva Canto | 2012-12-07 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' into connector_plugin | BlueWall | 2012-12-07 | 54 | -797/+2176 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-12-06 | 33 | -419/+1136 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-12-07 | 11 | -359/+462 |
| | |\ | |||||
| | | * | BulletSim: update DLLs and SOs with vehicle collision event check | Robert Adams | 2012-12-06 | 4 | -0/+0 |
| | | | | |||||
| | | * | BulletSim: rewrite and improve vehicle angularDeflection, verticalAttraction, | Robert Adams | 2012-12-06 | 2 | -83/+130 |
| | | | | | | | | | | | | | | | | | | | | | | | | linearMotorUp and related vehicle forces. Fixed problems with downward vehicle position correction forces being too large. Add vehicle collision flag so can sense whether vehicle is on the ground. | ||||
| | | * | BulletSim: update and add to the TODO list. | Robert Adams | 2012-12-06 | 1 | -31/+56 |
| | | | | |||||
| | | * | BulletSim: add detail logging detail flag so I don't have to comment and ↵ | Robert Adams | 2012-12-06 | 1 | -27/+34 |
| | | | | | | | | | | | | | | | | uncomment the detail logging when changing the depth of logged info. | ||||
| | | * | BulletSim: only check position sanity if the prim is physical -- the user ↵ | Robert Adams | 2012-12-06 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | can do anything dumb they wish. | ||||
| | | * | BulletSim: add values for material friction and restitution. Fix line ↵ | Robert Adams | 2012-12-06 | 1 | -191/+185 |
| | | | | | | | | | | | | | | | | endings in material definition file. | ||||
| | | * | BulletSim: Don't add gravity to down force -- let Bullet do that. Add ↵ | Robert Adams | 2012-12-06 | 1 | -14/+28 |
| | | | | | | | | | | | | | | | | VehicleAddForce to set of managed vehicle prim properties. | ||||
| | | * | BulletSim: Vehicle angular vertical attraction works. Other vehicle angular ↵ | Robert Adams | 2012-12-06 | 2 | -20/+38 |
| | | | | | | | | | | | | | | | | forces commented out for the moment for debugging. | ||||
| | | * | fix openjpeg on 64 bit OSX we were pointing to a file taht did not | nebadon | 2012-12-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | exist. |