| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge | Melanie | 2011-10-12 | 2 | -9/+8 |
|\ |
|
| * | Clarify explanation of DeleteScriptsOnStartup switch in [XEngine]. | Justin Clark-Casey (justincc) | 2011-10-04 | 2 | -9/+8 |
* | | Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmerge | Melanie | 2011-10-11 | 2 | -19/+38 |
|\ \
| |/ |
|
| * | copy config information on allow/disallow individual os functions into OpenSi... | Justin Clark-Casey (justincc) | 2011-09-30 | 2 | -19/+38 |
* | | Merge commit '6d0978594d1eca9ae56584afe38215f4262256e7' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+0 |
|\ \
| |/ |
|
| * | remove unused postgresql dll | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -0/+0 |
* | | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+8 |
|\ \
| |/ |
|
| * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all... | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -0/+8 |
* | | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge | Melanie | 2011-10-11 | 2 | -0/+9 |
|\ \
| |/ |
|
| * | Added a setting to [Startup] section of config that will allow the simulator ... | Kevin Houlihan & Michelle Argus | 2011-09-24 | 2 | -0/+9 |
* | | Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmerge | Melanie | 2011-10-11 | 2 | -5/+13 |
|\ \
| |/ |
|
| * | Clarify explanation of the "DeleteScriptsOnStartup" config switch and add thi... | Justin Clark-Casey (justincc) | 2011-09-24 | 2 | -5/+13 |
* | | Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Correct asset id of library default iris texture. | Justin Clark-Casey (justincc) | 2011-09-23 | 1 | -1/+1 |
* | | Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | Add BulletSim physics option details to OpenSim.ini.example. Marked as in de... | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -0/+2 |
* | | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+1 |
|\ \
| |/ |
|
| * | Remove old bullet DotNET and X libraries in preparation for BulletS | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -4/+1 |
* | | 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 a... | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -0/+6 |
* | | 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 |
* | | 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 ey... | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -6/+94 |
* | | 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 clothes... | Justin Clark-Casey (justincc) | 2011-09-16 | 3 | -2/+21 |
* | | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge | Melanie | 2011-10-11 | 9 | -140/+215 |
|\ \
| |/ |
|
| * | Write code to create minimum necessary body parts/clothing and avatar entries... | Justin Clark-Casey (justincc) | 2011-09-15 | 9 | -140/+215 |
* | | 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 |
* | | 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 |
| * | BulletSim: update values in OpenSimDefaults.ini to the same as defaults in th... | Robert Adams | 2011-08-30 | 1 | -4/+4 |
| * | 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 |
| * | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-26 | 3 | -16/+19 |
| |\ |
|
| | * | minor: Add explanative text for the new currency parameter. Convert some tab... | Justin Clark-Casey (justincc) | 2011-08-22 | 3 | -16/+19 |
| * | | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-19 | 7 | -7/+19 |
| |\ \
| | |/ |
|
| | * | Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... | Justin Clark-Casey (justincc) | 2011-08-19 | 1 | -0/+0 |
| | * | Add terminating quotes to http addresses in [SimulatorFeatures] section of Op... | Justin Clark-Casey (justincc) | 2011-08-16 | 1 | -2/+2 |
| | * | Change the default standalone asset cache to be the Flotsam asset cache (with... | Justin Clark-Casey (justincc) | 2011-08-16 | 2 | -5/+7 |
| | * | minor: Add warning to OpenSim.ini.example about bullet plugins not working ri... | Justin Clark-Casey (justincc) | 2011-08-16 | 1 | -0/+1 |
| | * | Added optional Login Service parameter "Currency" to be able to change the cu... | Snoopy Pfeffer | 2011-08-14 | 3 | -0/+6 |
| | * | WorldMap: Added map item for Land-for-Sale. Implemented backlist item timeout... | Snoopy Pfeffer | 2011-08-14 | 1 | -0/+3 |
| * | | 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 |
| |\ \
| | |/ |
|