aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' into careminsterMelanie2012-03-2717-58/+91
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-2710-12/+51
| |\ \
| | * | Add Garmin Kawaguichi to CONTRIBUTORS.txtJustin Clark-Casey (justincc)2012-03-271-0/+1
| | | |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-2715-138/+531
| | |\ \
| | | * | BulletSim: make avatar animations update properly.Robert Adams2012-03-263-9/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that ODE calls the avatar collision handling routine even if there are no collisions. This causes the animation to be updated. So, for instance, going from HOVER to FLY is caused by the physics engine calling the collision routine each frame with 0 collisions.
| | | * | BulletSim: update BulletSim binaries and configuration fixing a crash which ↵Robert Adams2012-03-265-1/+2
| | | | | | | | | | | | | | | | | | | | happens when there are more than a few hundred physical objects.
| | * | | In TerrainModule.cs, the command terrain save-tile is modified to remove an ↵Garmin Kawaguichi2012-03-271-2/+0
| | | | | | | | | | | | | | | | | | | | unnecessary double argument "minimum Y tile"
| * | | | Send the config section name up to the service classes themselves ↵Diva Canto2012-03-277-46/+40
| | |/ / | |/| | | | | | | | | | (XInventory and Assets).
* | | | Replace HG linker with core versionMelanie2012-03-271-13/+49
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-03-2612-45/+162
|\ \ \ \ | |/ / /
| * | | Add some more overloads to allow registering overloaded methods and listsMelanie2012-03-262-4/+16
| | | | | | | | | | | | | | | | of methods.
| * | | BulletSim: fix typo introducted by previous checkins (git merge sometimes ↵Robert Adams2012-03-261-3/+0
| | | | | | | | | | | | | | | | makes mistakes)
| * | | Merge branch 'bulletsim1'Robert Adams2012-03-2610-41/+149
| |\ \ \
| | * | | BulletSim: update BulletSim.dll and libBulletSim.so with latest versionsRobert Adams2012-03-264-0/+0
| | | | |
| | * | | Merge branch 'bulletsim1' of ↵Robert Adams2012-03-231-1/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://island.sciencesim.com/home/sceneapi/radams1/bs-opensim into bulletsim1 Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
| | | * | | BulletSim: remove confusion between angularVelocity and rotationalVelocity ↵Robert Adams2012-03-223-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
| | | * | | BulletSim: add updated (but not working) BulletSim dllsRobert Adams2012-03-214-0/+0
| | | | | |
| | | * | | BulletSim: update TODO list. Rearrange code for readability. Add per object ↵Robert Adams2012-03-212-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | friction and restitution runtime settable parameters.
| | | * | | BulletSim: Add AvatarRestitution parameter. Centralize computation of ↵Robert Adams2012-03-213-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | buoyancy for flying. Tweek avatar default friction and resititution
| | | * | | BulletSim: set buoyancy in only one placeRobert Adams2012-03-211-5/+3
| | | | | |
| | | * | | BulletSim: add some new runtime setable parameters to match the dll.Robert Adams2012-03-213-8/+17
| | | | | |
| | | * | | BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to ↵Robert Adams2012-03-214-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | the new lib32 and lib64 binary directories
| | | * | | BulletSim: Update list of TODO tasksRobert Adams2012-03-211-0/+13
| | | | | |
| | * | | | BulletSim: change default of shouldDisableContactPoolDynamicAllocation from ↵Robert Adams2012-03-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | False to True. It seems that collisions don't happen well when it is False (things fall through terrain).
| | * | | | BulletSim: Add new configuration parameters to get and set console commandsRobert Adams2012-03-231-4/+32
| | | | | |
| | * | | | BulletSim: add a bunch of internal Bullet configuration parameters to ↵Robert Adams2012-03-233-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | OpenSimDefaults.ini and the code.
| | * | | | BulletSim: remove confusion between angularVelocity and rotationalVelocity ↵Robert Adams2012-03-233-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
| | * | | | BulletSim: add updated (but not working) BulletSim dllsRobert Adams2012-03-234-0/+0
| | | | | |
| | * | | | BulletSim: update TODO list. Rearrange code for readability. Add per object ↵Robert Adams2012-03-232-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | friction and restitution runtime settable parameters.
| | * | | | BulletSim: Add AvatarRestitution parameter. Centralize computation of ↵Robert Adams2012-03-233-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | buoyancy for flying. Tweek avatar default friction and resititution
| | * | | | BulletSim: set buoyancy in only one placeRobert Adams2012-03-231-5/+3
| | | | | |
| | * | | | BulletSim: add some new runtime setable parameters to match the dll.Robert Adams2012-03-233-8/+17
| | | | | |
| | * | | | BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to ↵Robert Adams2012-03-234-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | the new lib32 and lib64 binary directories
| | * | | | BulletSim: Update list of TODO tasksRobert Adams2012-03-231-0/+13
| | | | | |
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-265-9/+35
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-261-1/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
| | * | | | | Fix compile error in ScriptModuelComms and add some debugging into the modInvokeMic Bowman2012-03-251-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | routines to simplify finding method registration issues.
| * | | | | | Add a hust UUID to the script invocationsMelanie2012-03-265-9/+25
| |/ / / / /
| * | | | | Fix the omission on the interface declarationMelanie2012-03-261-1/+1
| | | | | |
* | | | | | Fix the omission on the interface declarationMelanie2012-03-261-1/+1
| | | | | |
* | | | | | Fix TypoMelanie2012-03-261-1/+1
| | | | | |
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-261-1/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
| * | | | | Further simplify ScriptCommsMelanie2012-03-261-1/+3
| | | | | |
| * | | | | Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-262-2/+23
| | | | | |
| * | | | | Correct the design error I introduced into ScriptComms. Untested but about toMelanie2012-03-262-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | be.
* | | | | | Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-262-2/+23
| | | | | |
* | | | | | Correct the design error I introduced into ScriptComms. Untested but about toMelanie2012-03-262-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | be.
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-2512-130/+347
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Simplify the module invocation registration. The types and method nameMelanie2012-03-252-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | can be pulled fromt he delegate so we don't need to pass them explicitly
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-03-246-48/+85
| |\ \ \ \ \ | | | |_|/ / | | |/| | |