aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge commit '28a482a7ee2cebab1aa720477af175d7e26d702e' into bigmergeMelanie2011-10-110-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-2112-90/+28
| |\ \ | | |/
* | | Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmergeMelanie2011-10-111-5/+5
|\ \ \ | |/ /
| * | Commented out new debug statements in ScenePresenceDan Lake2011-09-211-5/+5
* | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-1112-90/+28
|\ \ \ | | |/ | |/|
| * | Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-2212-90/+28
| |/
* | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmergeMelanie2011-10-113-2/+203
|\ \ | |/
| * Move code which handles NPC movement into Scene so that this can also be used...Justin Clark-Casey (justincc)2011-09-213-1/+203
* | Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmergeMelanie2011-10-111-8/+0
|\ \ | |/
| * Remove unused and never set SP.PreviousRotationJustin Clark-Casey (justincc)2011-09-211-8/+0
* | Merge commit '572b680cb01a856f860b1e3fb40a7153a36113f2' into bigmergeMelanie2011-10-110-0/+0
|\ \ | |/
| * get rid of an incredibly noisy logging message from the last commitJustin Clark-Casey (justincc)2011-09-211-1/+1
* | Merge commit 'c9c40343afb313ee6999c6dfb2663fb06bfac407' into bigmergeMelanie2011-10-110-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-212-12/+18
| |\
* | \ Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmergeMelanie2011-10-113-5/+110
|\ \ \ | |/ /
| * | When calling osNpcMoveTo(), rotate the avatar in the direction of travel.Justin Clark-Casey (justincc)2011-09-213-6/+115
* | | Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmergeMelanie2011-10-111-2/+4
|\ \ \ | | |/ | |/|
| * | Null simulation data must return a non-null region settings or other parts of...Dan Lake2011-09-201-2/+4
* | | Merge commit '7829b7a6019454b8e83497456bea81539c9a4234' into bigmergeMelanie2011-10-110-0/+0
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-203-66/+0
| |\ \ | | |/
* | | Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmergeMelanie2011-10-111-9/+13
|\ \ \ | |/ /
| * | Make debug statements in ScenePresence consistent and add a few moreDan Lake2011-09-201-10/+14
* | | Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmergeMelanie2011-10-113-66/+0
|\ \ \ | | |/ | |/|
| * | Remove vestigal OpenSim.Data mono addins extension points that don't look lik...Justin Clark-Casey (justincc)2011-09-203-66/+0
| |/
* | Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmergeMelanie2011-10-111-2/+2
|\ \ | |/
| * adjust some whitespace to trigger another build, to check the last failure wa...Justin Clark-Casey (justincc)2011-09-171-2/+2
* | Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmergeMelanie2011-10-111-0/+2
|\ \ | |/
| * Add BulletSim physics option details to OpenSim.ini.example. Marked as in de...Justin Clark-Casey (justincc)2011-09-171-0/+2
* | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmergeMelanie2011-10-1111-7086/+1
|\ \ | |/
| * Remove old bullet DotNET and X libraries in preparation for BulletSJustin Clark-Casey (justincc)2011-09-1711-7087/+1
* | Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmergeMelanie2011-10-111-0/+6
|\ \ | |/
| * Add back BulletSPlugin.dll.config that I somehow managed to delete today in a...Justin Clark-Casey (justincc)2011-09-171-0/+6
* | Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmergeMelanie2011-10-112-1/+7
|\ \ | |/
| * On setting a new avatar appearance, if height hasn't changed then don't set t...Justin Clark-Casey (justincc)2011-09-172-1/+7
* | Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * Revert "uncomment Standalone config in OpenSim.ini.example."Justin Clark-Casey (justincc)2011-09-171-1/+1
* | Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmergeMelanie2011-10-112-6/+23
|\ \ | |/
| * Stop the avatar stalling on its first boarder cross when using the ODE pluginJustin Clark-Casey (justincc)2011-09-162-6/+23
* | Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmergeMelanie2011-10-111-0/+4
|\ \ | |/
| * minor: I was wrong about OffsetPosition - sometimes it genuinely does return ...Justin Clark-Casey (justincc)2011-09-161-0/+4
* | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmergeMelanie2011-10-114-7/+24
|\ \ | |/
| * Remove setter from SP.OffsetPosition, since all sets should flow through SP.A...Justin Clark-Casey (justincc)2011-09-162-5/+23
* | Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmergeMelanie2011-10-111-6/+94
|\ \ | |/
| * Fix base_hair.dat to actually contain the base hair asset rather than base ey...Justin Clark-Casey (justincc)2011-09-161-6/+94
* | Merge commit 'c695e23dd9474e31b031e4d1f57b23aba386145a' into bigmergeMelanie2011-10-110-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-163-7/+3
| |\
* | \ Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmergeMelanie2011-10-111-91/+88
|\ \ \ | |/ /
| * | Updated some variables to be closer to the coding standards (and easier to un...Kevin Houlihan2011-09-161-91/+88
* | | Merge commit '30b68388378f96f83b3f9509f72664869a6c20c6' into bigmergeMelanie2011-10-110-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimjustincc2011-09-161-1/+4
| |\ \ | | |/
generated by cgit v1.1 at 2024-12-15 23:50:07 +0000