aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmergeMelanie2011-10-256-2/+48
|\
| * Implement osNpcStand(<npc-id>)Justin Clark-Casey (justincc)2011-10-176-2/+48
* | Merge commit 'ddcb88ff53d2348dfc81451a3ec61bb643c49aff' into bigmergeMelanie2011-10-250-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-171-1/+0
| |\
* | \ Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmergeMelanie2011-10-2511-15/+74
|\ \ \ | |/ /
| * | Implement osNpcSit(). This is still in development so don't trust itJustin Clark-Casey (justincc)2011-10-1710-5/+75
* | | Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmergeMelanie2011-10-251-1/+0
|\ \ \ | | |/ | |/|
| * | Bug fix on the bug fix on UserAccountService.csDiva Canto2011-10-161-1/+0
| |/
* | Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmergeMelanie2011-10-251-0/+3
|\ \ | |/
| * Guard HGAssetService against uninitialized variables and null arguments.Diva Canto2011-10-151-0/+3
* | Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * improve method doc on Scene.OtherRegionUp()Justin Clark-Casey (justincc)2011-10-151-4/+4
* | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmergeMelanie2011-10-256-17/+8
|\ \ | |/
| * move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t...Justin Clark-Casey (justincc)2011-10-156-17/+8
* | MergeMelanie2011-10-252-3/+1
* | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmergeMelanie2011-10-257-45/+24
|\ \ | |/
| * fetch physical_prim switch from [Startup] config from inside scene, as is don...Justin Clark-Casey (justincc)2011-10-157-48/+23
* | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmergeMelanie2011-10-253-7/+7
|\ \ | |/
| * remove now redundant m_physical_prim flag from SOP.ApplyPhysics()Justin Clark-Casey (justincc)2011-10-153-7/+7
* | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmergeMelanie2011-10-253-2/+14
|\ \ | |/
| * Restore [Startup] physical_prim flag which can stop any prims being subject t...Justin Clark-Casey (justincc)2011-10-153-2/+14
* | Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmergeMelanie2011-10-251-4/+0
|\ \ | |/
| * remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ...Justin Clark-Casey (justincc)2011-10-151-4/+0
* | Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmergeMelanie2011-10-251-27/+21
|\ \ | |/
| * refactor: Remove redundant code in SOP.UpdatePrimFlags()Justin Clark-Casey (justincc)2011-10-151-27/+21
* | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmergeMelanie2011-10-253-11/+19
|\ \ | |/
| * factor common code out into SOP.RemoveFromPhysics()Justin Clark-Casey (justincc)2011-10-153-11/+19
* | Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmergeMelanie2011-10-252-53/+36
|\ \ | |/
| * reduce access to ODECharacter methods to make code analysis easier. Eliminat...Justin Clark-Casey (justincc)2011-10-152-54/+36
* | Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmergeMelanie2011-10-251-19/+17
|\ \ | |/
| * restrict unnecessary access levels on ODEPrim fields/propertiesJustin Clark-Casey (justincc)2011-10-151-19/+17
* | Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmergeMelanie2011-10-253-129/+195
|\ \ | |/
| * refactor: make methods that do not need to be public in ODE private or intern...Justin Clark-Casey (justincc)2011-10-153-129/+195
* | Merge commit 'bea65b06a445c267ecb77be08452146cb7fee1ce' into bigmergeMelanie2011-10-251-0/+1
|\ \ | |/
| * Add back the missing bin/addon-modules directory that I somehow managed to ac...Justin Clark-Casey (justincc)2011-10-141-0/+1
* | Merge commit '03102864f0d9851b6937ca5472f48f10ec861a26' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * change default ODE world_stepsize to 0.0178 from 0.02Justin Clark-Casey (justincc)2011-10-141-2/+2
* | Merge commit '4bfc2f5cdea4b739110cae3b37945d88ad527334' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * Change hardcoded ODE total frame time to match the default total frame time (...Justin Clark-Casey (justincc)2011-10-141-1/+1
* | Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmergeMelanie2011-10-251-46/+44
|\ \ | |/
| * Bug fix -- Test User on first run standalone might not be created properly: l...Diva Canto2011-10-131-46/+44
* | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmergeMelanie2011-10-257-8/+15
|\ \ | |/
| * refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s...Justin Clark-Casey (justincc)2011-10-147-8/+15
* | Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmergeMelanie2011-10-252-88/+125
|\ \ | |/
| * Extract NullPhysicsScene from PhysicsScene to improve code readabilityJustin Clark-Casey (justincc)2011-10-142-88/+125
* | Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmergeMelanie2011-10-251-0/+5
|\ \ | |/
| * Don't execute rest of code in XEngine.RemoveRegion() and Close() if the modul...Justin Clark-Casey (justincc)2011-10-141-0/+6
* | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmergeMelanie2011-10-252-19/+75
|\ \ | |/
| * Expose minimum frame time and update periods for experimentation.Justin Clark-Casey (justincc)2011-10-132-19/+75
* | Merge commit '128d8dfd8b355f84a71e2093e942937ca720c5c6' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
generated by cgit v1.1 at 2024-12-28 04:23:35 +0000