Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 12 | -45/+162 |
|\ | |||||
| * | Add some more overloads to allow registering overloaded methods and lists | Melanie | 2012-03-26 | 2 | -4/+16 |
| | | | | | | | | of methods. | ||||
| * | BulletSim: fix typo introducted by previous checkins (git merge sometimes ↵ | Robert Adams | 2012-03-26 | 1 | -3/+0 |
| | | | | | | | | makes mistakes) | ||||
| * | Merge branch 'bulletsim1' | Robert Adams | 2012-03-26 | 10 | -41/+149 |
| |\ | |||||
| | * | BulletSim: update BulletSim.dll and libBulletSim.so with latest versions | Robert Adams | 2012-03-26 | 4 | -0/+0 |
| | | | |||||
| | * | Merge branch 'bulletsim1' of ↵ | Robert Adams | 2012-03-23 | 1 | -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 Adams | 2012-03-22 | 3 | -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 dlls | Robert Adams | 2012-03-21 | 4 | -0/+0 |
| | | | | |||||
| | | * | BulletSim: update TODO list. Rearrange code for readability. Add per object ↵ | Robert Adams | 2012-03-21 | 2 | -17/+17 |
| | | | | | | | | | | | | | | | | friction and restitution runtime settable parameters. | ||||
| | | * | BulletSim: Add AvatarRestitution parameter. Centralize computation of ↵ | Robert Adams | 2012-03-21 | 3 | -4/+11 |
| | | | | | | | | | | | | | | | | buoyancy for flying. Tweek avatar default friction and resititution | ||||
| | | * | BulletSim: set buoyancy in only one place | Robert Adams | 2012-03-21 | 1 | -5/+3 |
| | | | | |||||
| | | * | BulletSim: add some new runtime setable parameters to match the dll. | Robert Adams | 2012-03-21 | 3 | -8/+17 |
| | | | | |||||
| | | * | BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to ↵ | Robert Adams | 2012-03-21 | 4 | -0/+0 |
| | | | | | | | | | | | | | | | | the new lib32 and lib64 binary directories | ||||
| | | * | BulletSim: Update list of TODO tasks | Robert Adams | 2012-03-21 | 1 | -0/+13 |
| | | | | |||||
| | * | | BulletSim: change default of shouldDisableContactPoolDynamicAllocation from ↵ | Robert Adams | 2012-03-23 | 2 | -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 commands | Robert Adams | 2012-03-23 | 1 | -4/+32 |
| | | | | |||||
| | * | | BulletSim: add a bunch of internal Bullet configuration parameters to ↵ | Robert Adams | 2012-03-23 | 3 | -0/+52 |
| | | | | | | | | | | | | | | | | OpenSimDefaults.ini and the code. | ||||
| | * | | BulletSim: remove confusion between angularVelocity and rotationalVelocity ↵ | Robert Adams | 2012-03-23 | 3 | -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 dlls | Robert Adams | 2012-03-23 | 4 | -0/+0 |
| | | | | |||||
| | * | | BulletSim: update TODO list. Rearrange code for readability. Add per object ↵ | Robert Adams | 2012-03-23 | 2 | -17/+17 |
| | | | | | | | | | | | | | | | | friction and restitution runtime settable parameters. | ||||
| | * | | BulletSim: Add AvatarRestitution parameter. Centralize computation of ↵ | Robert Adams | 2012-03-23 | 3 | -4/+11 |
| | | | | | | | | | | | | | | | | buoyancy for flying. Tweek avatar default friction and resititution | ||||
| | * | | BulletSim: set buoyancy in only one place | Robert Adams | 2012-03-23 | 1 | -5/+3 |
| | | | | |||||
| | * | | BulletSim: add some new runtime setable parameters to match the dll. | Robert Adams | 2012-03-23 | 3 | -8/+17 |
| | | | | |||||
| | * | | BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to ↵ | Robert Adams | 2012-03-23 | 4 | -0/+0 |
| | | | | | | | | | | | | | | | | the new lib32 and lib64 binary directories | ||||
| | * | | BulletSim: Update list of TODO tasks | Robert Adams | 2012-03-23 | 1 | -0/+13 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 5 | -9/+35 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | ||||
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-03-26 | 1 | -1/+11 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | ||||
| | * | | | Fix compile error in ScriptModuelComms and add some debugging into the modInvoke | Mic Bowman | 2012-03-25 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | routines to simplify finding method registration issues. | ||||
| * | | | | Add a hust UUID to the script invocations | Melanie | 2012-03-26 | 5 | -9/+25 |
| |/ / / | |||||
| * | | | Fix the omission on the interface declaration | Melanie | 2012-03-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix the omission on the interface declaration | Melanie | 2012-03-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix Typo | Melanie | 2012-03-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 1 | -1/+3 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | ||||
| * | | | Further simplify ScriptComms | Melanie | 2012-03-26 | 1 | -1/+3 |
| | | | | |||||
| * | | | Dynamically create the delegate type to reduce complexity in the caller | Melanie | 2012-03-26 | 2 | -2/+23 |
| | | | | |||||
| * | | | Correct the design error I introduced into ScriptComms. Untested but about to | Melanie | 2012-03-26 | 2 | -18/+25 |
| | | | | | | | | | | | | | | | | be. | ||||
* | | | | Dynamically create the delegate type to reduce complexity in the caller | Melanie | 2012-03-26 | 2 | -2/+23 |
| | | | | |||||
* | | | | Correct the design error I introduced into ScriptComms. Untested but about to | Melanie | 2012-03-26 | 2 | -18/+25 |
| | | | | | | | | | | | | | | | | be. | ||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-03-25 | 12 | -130/+347 |
|\ \ \ \ | |/ / / | |||||
| * | | | Simplify the module invocation registration. The types and method name | Melanie | 2012-03-25 | 2 | -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/opensim | Mic Bowman | 2012-03-24 | 6 | -48/+85 |
| |\ \ \ | |||||
| | * | | | Allow the user to enter help topics in upper or lowercase. | Justin Clark-Casey (justincc) | 2012-03-24 | 2 | -15/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Forcing uppercase (e.g. help Assets) is too annoying. Thanks to WhiteStar for pointing this out. | ||||
| | * | | | Hack example on to "terrain save-tile" extended help. | Justin Clark-Casey (justincc) | 2012-03-24 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Garmin Kawaguichi for the initially suggested text. | ||||
| | * | | | Use system provided temporary file in "terrain save-tile" to avoid problems ↵ | Justin Clark-Casey (justincc) | 2012-03-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with drive letters on windows Thanks to Garmin Kawaguichi for picking up on this and providing an initial solution (which I adapted). | ||||
| | * | | | Give feedback when "terrain save-tile" is not successfully invoked. | Justin Clark-Casey (justincc) | 2012-03-24 | 3 | -30/+58 |
| | |/ / | |||||
| * | | | Add support for key, vector, rotation and list types for both | Mic Bowman | 2012-03-24 | 4 | -74/+237 |
| |/ / | | | | | | | | | | | | | | | | arguments and return values to the modInvoke family of functions. See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke | ||||
| * | | Have the PhysicsParameters module output console command responses | Robert Adams | 2012-03-23 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | directly to the console rather than logging at INFO (which doesn't output anything for WARN). There should really be a WriteLine method on ICommandConsole so all of the different commands don't have to figure out where the command output should go. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-23 | 4 | -6/+27 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | fix yield prolog so it compiles with mono 2.11 there has been a bugzilla | nebadon | 2012-03-23 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | report files with mono project in regards to this change, this simply lets us move forward with using mono 2.11 for now : https://bugzilla.xamarin.com/show_bug.cgi?id=4052 | ||||
| * | | Comment out log message about sending periodic appearance updates. | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -2/+2 |
| | | |