| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -2/+2 |
| |\ | |||||
| | * | Fix typos | Melanie | 2012-03-28 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 7 | -16/+225 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-03-28 | 5 | -16/+175 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 3 | -2/+120 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 2 | -1/+116 |
| | | | |\ | |||||
| | | | * | | Add "friends show cache <first-name> <last-name>" command for debugging ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 3 | -2/+120 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | purposes. This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly. | ||||
| | | * | | | HG: Switch root folders from under the viewer. Towards HG 2.0. This is ↵ | Diva Canto | 2012-03-27 | 2 | -14/+55 |
| | | | |/ | | |/| | | | | | | | | | guarded by an obscure config that no one but me should be using at this point. | ||||
| | * | | | Start on Bulk inventory update via CAPS. Not functional yet. HG v2 | Melanie | 2012-03-28 | 2 | -0/+50 |
| | |/ / | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 4 | -48/+73 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Client/IClientInventory.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | ||||
| | * | | Add a corresponding method for items. HG v2 | Melanie | 2012-03-28 | 2 | -0/+39 |
| | | | | |||||
| | * | | Add SendRemoveInventoryFolders which allows to remove one or more | Melanie | 2012-03-28 | 2 | -1/+77 |
| | |/ | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come | ||||
| | * | minor: Add some documentation to OnNewClient and OnClientClosed events | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -2/+10 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 3 | -4/+2 |
| | |\ | |||||
| | * | | minor: clean up some code formatting in VivoxVoiceModule.cs | Justin Clark-Casey (justincc) | 2012-03-27 | 1 | -54/+25 |
| | | | | |||||
| * | | | Add SendRemoveInventoryFolders which allows to remove one or more | Melanie | 2012-03-28 | 2 | -1/+77 |
| | | | | | | | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 15 | -53/+325 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | Reverse a conditional in XInventory that made updating system folder evrsion ↵ | Melanie | 2012-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | numbers impossible | ||||
| | * | | Let grided simulators retrieve the user's inventory skeleton | Diva Canto | 2012-03-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 13 | -49/+326 |
| | |\ \ | | |/ | |||||
| | | * | Two new scripting functions osInviteToGroup(userID) and ↵ | Snoopy Pfeffer | 2012-03-27 | 5 | -23/+183 |
| | | | | | | | | | | | | | osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups. | ||||
| | | * | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim | Snoopy Pfeffer | 2012-03-27 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-03-27 | 178 | -2173/+6602 |
| | | | |\ | |||||
| | | | * | | When loading objects from DB, first add to scene, then call ↵ | Dan Lake | 2012-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | TriggerOnSceneObjectLoaded. | ||||
| | | * | | | User level based restrictions for HyperGrid teleports, asset uploads, group ↵ | Snoopy Pfeffer | 2012-03-27 | 8 | -25/+142 |
| | | | |/ | | |/| | | | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users. | ||||
| | * | | | Amend to previous commit regarding the config name. Bugs bite. | Diva Canto | 2012-03-27 | 1 | -2/+0 |
| | |/ / | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 3 | -3/+37 |
| |\ \ \ | |/ / | |||||
| | * | | HG: beginning of a more restrictive inventory access procedure (optional). ↵ | Diva Canto | 2012-03-27 | 3 | -3/+37 |
| | | | | | | | | | | | | | Experimental: we'll try switching the root folder from under the viewer. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 11 | -57/+88 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 4 | -11/+48 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-27 | 10 | -137/+519 |
| | | |\ \ | |||||
| | | | * | | BulletSim: make avatar animations update properly. | Robert Adams | 2012-03-26 | 3 | -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. | ||||
| | | * | | | In TerrainModule.cs, the command terrain save-tile is modified to remove an ↵ | Garmin Kawaguichi | 2012-03-27 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | unnecessary double argument "minimum Y tile" | ||||
| | * | | | | Send the config section name up to the service classes themselves ↵ | Diva Canto | 2012-03-27 | 7 | -46/+40 |
| | | |/ / | |/| | | | | | | | | | | (XInventory and Assets). | ||||
| * | | | | Replace HG linker with core version | Melanie | 2012-03-27 | 1 | -13/+49 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 7 | -44/+151 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | 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 | 5 | -40/+138 |
| | |\ \ \ | |||||
| | | * \ \ | 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: 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 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -7/+16 |
| | | | | | | | |||||
| | | | * | | | 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 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -0/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |