aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| | * BulletSim: modify LIMIT_MOTOR_UP to limit BOAT types to be at water rather ↵Robert Adams2012-12-111-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 controlRobert Adams2012-12-114-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 Adams2012-12-111-1/+8
| | | | | | | | | | | | single prim vehicles not working (the surf board now zooms).
| | * BulletSim: comment out some chatty debug logging. Rearrange some code in ↵Robert Adams2012-12-102-5/+7
| | | | | | | | | | | | BSDynamics to make velocity vs force calculation clearer.
| | * BulletSim: Fix crash on the destruction of physical linksets.Robert Adams2012-12-1012-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 Adams2012-12-091-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 Adams2012-12-092-5/+17
| | |
| | * HGAssetMapper: Get wasn't really working. It's true that some assets are ↵Diva Canto2012-12-091-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 Canto2012-12-091-6/+4
| | | | | | | | | | | | in, to avoid race conditions on the client.
| * | Replace Mono.Addins librariesBlueWall2012-12-113-0/+0
| | | | | | | | | | | | Mono.Addins.Setup uses Ionic.Zip for compression. Libraries Compiled on Win32
| * | Hide some console output when initializing addin repositoryBlueWall2012-12-112-0/+29
| |/ | | | | | | We do this in OpenSim.exe to hide output when unmanaged dll are scanned by mono addins. Libomv has hard-coded path to "." for the openjpeg libraries, causing output to the console when they are scanned. We will cover this up for now, then look at getting libomv to look for the libs outside the "." later.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-12-094-17/+17
| |\
| * | UserManagementModule: search the local cache for names too.Diva Canto2012-12-092-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 Canto2012-12-093-0/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-0923-94/+1356
|\ \ \ | | |/ | |/|
| * | Restrict IPresenceData.VerifyAgentBlueWall2012-12-094-17/+17
| |/ | | | | | | Restrict IPresenceData.VerifyAgent to only return bool result
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-12-087-91/+111
| |\
| | * Add back openjpeg dll for WindowsBlueWall2012-12-082-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 Adams2012-12-082-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 Adams2012-12-081-6/+9
| | | | | | | | | | | | caused the native shapes to be rebuilt when not necessary.
| | * BulletSim: update comments and add more to TODO list.Robert Adams2012-12-082-4/+10
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-12-083-2/+3
| | |\
| | * | Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message ↵Justin Clark-Casey (justincc)2012-12-081-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 PresenceBlueWall2012-12-084-0/+36
| | |/ | |/|
| * | Format changeBlueWall2012-12-071-1/+1
| | | | | | | | | | | | Removed some white space in a line, looking to trigger a build
| * | One more time...BlueWall2012-12-071-1/+1
| | | | | | | | | | | | needed one more "../" in the path (copy paste): Thanks BrucePatton for catching that one
| * | Prebuild fixBlueWall2012-12-072-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/opensimBlueWall2012-12-071-0/+5
| |\
| | * Added missing config var in grided sims.Diva Canto2012-12-071-0/+5
| | |
| * | Merge branch 'master' into connector_pluginBlueWall2012-12-0754-797/+2176
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-12-0633-419/+1136
| | |\
| | * | Trying to prevent old route of sending attachments, simulator version ↵Diva Canto2012-12-061-1/+1
| | | | | | | | | | | | | | | | unknown maybe due to timeout. mantis #6450
| * | | Merge branch 'master' into connector_pluginBlueWall2012-11-2614-359/+583
| |\ \ \
| * \ \ \ Merge branch 'master' into connector_pluginBlueWall2012-11-25453-8828/+13565
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
| * \ \ \ \ Merge branch 'master' into connector_pluginBlueWall2012-10-2066-1395/+3027
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into connector_pluginBlueWall2012-10-1919-59/+144
| |\ \ \ \ \ \
| * | | | | | | Move PluginManagerBlueWall2012-10-195-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move PluginManager out to OpenSimFramework for general use
| * | | | | | | Add logging to help track sequence of eventsBlueWall2012-10-111-0/+2
| | | | | | | |
| * | | | | | | Implement plugin unloadingBlueWall2012-10-102-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plugin may be enabled and disabled on the fly.
| * | | | | | | Add System.Core to referencesBlueWall2012-10-101-0/+1
| | | | | | | |
| * | | | | | | Fix registry issueBlueWall2012-10-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rebuild registry if loading from a local dll to give access to the addin data for it on the first pass.
| * | | | | | | missed some conflict markupBlueWall2012-10-091-1/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into connector_pluginBlueWall2012-10-0931-222/+809
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/ServerMain.cs
| * | | | | | | | Added parts to manage repositories and plugin managementBlueWall2012-10-068-1/+1051
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is working - more testing to follow, then soem documentation
| * | | | | | | | Remove duplicate filesBlueWall2012-10-032-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are keeping these in bin/lib(32/64) now
| * | | | | | | | Update Mono.AddinsBlueWall2012-10-033-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Mono.Addins to latest - 3177b22e958c82bf2c5655ac3d4ef7ad25cc2588
| * | | | | | | | Merge branch 'master' of /home/opensim/var/repo/opensim into modular_configBlueWall2012-10-0328-327/+728
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add modular configuration for Robust connectorsBlueWall2012-10-035-0/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can provide modular ini for connectors... look for our configuration in the following places... 1) in the default ini/-inifile 2) in the named file (ConfigName) located in the configured directory (see Robust[.HG].ini [Start] section for ConfigDirectory) 3) in the repository named in the connector (ConfigURL) In this case, the file will be written into the configured directory with the specified See example connector/service @ https://github.com/BlueWall/SlipStream for testing.
* | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-12-0733-419/+1136
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-12-0711-359/+462
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-10-25 03:32:40 +0000