| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+2 |
| |\ | |||||
| | * | Add BulletSim physics option details to OpenSim.ini.example. Marked as in ↵ | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -0/+2 |
| | | | | | | | | | development and experimental. | ||||
| * | | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+1 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs prebuild.xml | ||||
| | * | Remove old bullet DotNET and X libraries in preparation for BulletS | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -4/+1 |
| | | | | | | | | | | | These weren't working properly anyway. You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well. | ||||
| * | | Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+6 |
| |\ \ | |/ | |||||
| | * | Add back BulletSPlugin.dll.config that I somehow managed to delete today in ↵ | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -0/+6 |
| | | | | | | | | | a00327d | ||||
| * | | Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Revert "uncomment Standalone config in OpenSim.ini.example." | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This reverts commit 44a491f36bbe2094634e356591381c90f87e2125. This makes packaging OpenSim slightly easier but then generates a FriendsConnector error if naively used after compilation. So let's revert to stick with the "DataStore" error for now - at least that's a known error. | ||||
| * | | Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge | Melanie | 2011-10-11 | 1 | -6/+94 |
| |\ \ | |/ | |||||
| | * | Fix base_hair.dat to actually contain the base hair asset rather than base ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -6/+94 |
| | | | | | | | | | | | | | | | | | eyes by mistake. I must have had it cached last night. This now makes completely fresh avatar setups appear properly (remember to wipe viewer cache and server cache as well as database). As a bonus, eyes now appear by default too! | ||||
| * | | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge | Melanie | 2011-10-11 | 1 | -6/+0 |
| |\ \ | |/ | |||||
| | * | Fix build errors on Windows by adding missing OpenSim.Services.Base reference | justincc | 2011-09-16 | 1 | -6/+0 |
| | | | |||||
| * | | Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmerge | Melanie | 2011-10-11 | 3 | -2/+21 |
| |\ \ | |/ | |||||
| | * | On standalone, by default create the necessary minimum body parts and ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 3 | -2/+21 |
| | | | | | | | | | | | | | | | clothes necessary to display a viewer 2 avatar, as implemented in c4efb97d This is controlled by the CreateDefaultAvatarEntries switch in the [UserAccountService] section of config-include/Stnadalone.ini This is left as false in grid mode | ||||
| * | | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge | Melanie | 2011-10-11 | 9 | -140/+215 |
| |\ \ | |/ | |||||
| | * | Write code to create minimum necessary body parts/clothing and avatar ↵ | Justin Clark-Casey (justincc) | 2011-09-15 | 9 | -140/+215 |
| | | | | | | | | | | | | | | | | | | | | | | | | | entries to make a newly created user appear as a non-cloud on viewer 2 Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries. Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim. Default is currently off. My intention is to switch it on for standalone shortly. This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities. Need to fix creation of suitable entries for users created as estate owners on standalone. Avatars still appear with spooky empty eyes, need to see if we can address this. This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461) which can be used. | ||||
| * | | Bring us up to date. | Tom | 2011-09-14 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | uncomment Standalone config in OpenSim.ini.example. | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -1/+1 |
| | | | | | | | | | | | This is to make my life easier when creating releases. I think that it also gives a better story for anybody newly compiling from source. | ||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 28 | -612/+329 |
| |\ \ | |/ | |||||
| | * | Fixed BulletSim config files for Linux *.so libraries. | Snoopy Pfeffer | 2011-09-04 | 1 | -2/+2 |
| | | | |||||
| | * | also get "nant clean" to remove old .mdb from .exe and .dll | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -0/+0 |
| | | | |||||
| | * | Hack our copy of Prebuild to just delete the dlls and mdbs in Physics, so as ↵ | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -0/+0 |
| | | | | | | | | | to leave the new config file | ||||
| | * | BulletSim: update values in OpenSimDefaults.ini to the same as defaults in ↵ | Robert Adams | 2011-08-30 | 1 | -4/+4 |
| | | | | | | | | | the source. | ||||
| | * | BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read. | Robert Adams | 2011-08-30 | 4 | -0/+0 |
| | | | |||||
| | * | BulletSim: add mesh representation. Use meshes for static objects and switch ↵ | Robert Adams | 2011-08-26 | 4 | -1/+3 |
| | | | | | | | | | to hulls for physical objects. | ||||
| | * | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-26 | 3 | -16/+19 |
| | |\ | |||||
| | | * | minor: Add explanative text for the new currency parameter. Convert some ↵ | Justin Clark-Casey (justincc) | 2011-08-22 | 3 | -16/+19 |
| | | | | | | | | | | | | | tabs to spaces | ||||
| | * | | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-19 | 7 | -7/+19 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
| | | * | Get rid of HttpServer.dll to avoid confusion since we use ↵ | Justin Clark-Casey (justincc) | 2011-08-19 | 1 | -0/+0 |
| | | | | | | | | | | | | | HttpServer_OpenSim.dll (patched version) instead | ||||
| | | * | Add terminating quotes to http addresses in [SimulatorFeatures] section of ↵ | Justin Clark-Casey (justincc) | 2011-08-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | OpenSim.ini.example. As per http://opensimulator.org/mantis/view.php?id=5638. Thanks DutchGlory. | ||||
| | | * | Change the default standalone asset cache to be the Flotsam asset cache ↵ | Justin Clark-Casey (justincc) | 2011-08-16 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | (with memory caching not enabled). This matches the GridCommon setting and is the best tested setting. It appears to work fine on standalone. Also, add information that the flotsam asset cache is the recommended cache, since it is most used and actively maintained. | ||||
| | | * | minor: Add warning to OpenSim.ini.example about bullet plugins not working ↵ | Justin Clark-Casey (justincc) | 2011-08-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | right now, pending the new plugin | ||||
| | | * | Added optional Login Service parameter "Currency" to be able to change the ↵ | Snoopy Pfeffer | 2011-08-14 | 3 | -0/+6 |
| | | | | | | | | | | | | | currency name shown in the viewer. | ||||
| | | * | WorldMap: Added map item for Land-for-Sale. Implemented backlist item ↵ | Snoopy Pfeffer | 2011-08-14 | 1 | -0/+3 |
| | | | | | | | | | | | | | timeouts (default 10 minutes; see also new config file setting BlacklistTimeout) and removing backlisted neigboring regions that have been restarted from the blacklist. | ||||
| | * | | BulletSim: add runtime setting of physics parameters. Update default values. | Robert Adams | 2011-08-18 | 3 | -0/+0 |
| | | | | |||||
| | * | | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-05 | 15 | -545/+185 |
| | |\ \ | | |/ | |||||
| | | * | correct config comments mistakes | Justin Clark-Casey (justincc) | 2011-08-03 | 2 | -2/+1 |
| | | | | |||||
| | | * | Put config to enable disable [NPC] module. | Justin Clark-Casey (justincc) | 2011-08-03 | 2 | -0/+10 |
| | | | | | | | | | | | | | Default is disabled. You will need to explicitly enable to toy with this. | ||||
| | | * | Get osNpcCreate appearance working with avatars that are currently in the scene. | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -0/+33 |
| | | | | | | | | | | | | | | | | | | | Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing). Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing. Extended TestCreate() to check this. | ||||
| | | * | Make it clearer what the save_crashes setting in [Startup] actually does. | Justin Clark-Casey (justincc) | 2011-07-30 | 2 | -0/+6 |
| | | | | |||||
| | | * | Change default AllowScriptCrossings config setting to true. | Justin Clark-Casey (justincc) | 2011-07-23 | 2 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | When this setting is false and other defaults haven't been changed, scripts entering the simulator from another sim are automatically restarted but their state is not preserved. When this setting is true, state that accompanies the script is reloaded (e.g. if a script had a variable i = 1 when leaving the source region, it will still have i = 1 on the destination region). This setting does not affect crossings when regions are run in the same simulator. In this case, state is already preserved. | ||||
| | | * | Fixed serverside_object_permission default value confliction | Makopoppo | 2011-07-23 | 1 | -2/+2 |
| | | | | |||||
| | | * | Remove manually permissions settings on all current library items so that ↵ | Justin Clark-Casey (justincc) | 2011-07-23 | 12 | -538/+126 |
| | | | | | | | | | | | | | | | | | | | | | | they use the defaults instead. Some items had completely wrong permissions - this is easier than correcting them all. The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts) | ||||
| | | * | Revert "Don't load current/next/everyone/base permissions from the library ↵ | Justin Clark-Casey (justincc) | 2011-07-23 | 12 | -126/+538 |
| | | | | | | | | | | | | | | | | | | | | | | | | | item xml files - always use PermissionMask.All instead (which was the existing default)." There actually are uses for this. I will correct the perms instead since some entries appear to be wrong. This reverts commit 667b54f5a2a04fa5a2859397868d270eab3913f1. | ||||
| | | * | Don't load current/next/everyone/base permissions from the library item xml ↵ | Justin Clark-Casey (justincc) | 2011-07-23 | 12 | -538/+126 |
| | | | | | | | | | | | | | | | | | | | files - always use PermissionMask.All instead (which was the existing default). Library items always need the same permissions, so it doesn't make sense to load them from the xml files. This just opens the door to permissions mistakes. | ||||
| | * | | BulletSim: Parameters settable from ini file. Linksets. Physical property ↵ | Robert Adams | 2011-08-05 | 4 | -0/+42 |
| | | | | | | | | | | | | | value tuning | ||||
| | * | | BulletSim: Update dlls | Robert Adams | 2011-07-25 | 3 | -0/+0 |
| | | | | |||||
| | * | | BulletSim: fix buoyancy for prims. Start of configurable physics parameters. | Robert Adams | 2011-07-22 | 3 | -0/+0 |
| | | | | |||||
| | * | | Pass collisions and updates in pinned memory (saves marshaling). | Robert.Adams | 2011-07-22 | 4 | -0/+6 |
| | | | | | | | | | | | | | | | | Fix folding feet by using collision normals. Add constraint specification. | ||||
| | * | | Merge branch 'master' into bulletsim | Mic Bowman | 2011-07-22 | 4 | -27/+31 |
| | |\ \ | | |/ | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |