| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+8 |
|\ |
|
| * | Get OdeScene to use passed in time step rather than hard-coded 0.089 | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -2/+8 |
* | | Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge | Melanie | 2011-10-25 | 1 | -12/+4 |
|\ \
| |/ |
|
| * | Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless Ma... | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -12/+4 |
* | | Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+0 |
|\ \
| |/ |
|
| * | Removed redundant NotInTransit function from ScenePresence. IsInTransit=false... | Dan Lake | 2011-10-19 | 1 | -5/+0 |
* | | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge | Melanie | 2011-10-25 | 2 | -48/+48 |
|\ \
| |/ |
|
| * | Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line e... | Dan Lake | 2011-10-19 | 2 | -48/+48 |
* | | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 2 | -4/+4 |
|\ \
| |/ |
|
| * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... | Dan Lake | 2011-10-19 | 2 | -4/+4 |
* | | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+3 |
|\ \
| |/ |
|
| * | Allow an avatar to be explicitly named to the "debug packet" command | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -2/+3 |
* | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter w... | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -1/+1 |
* | | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge | Melanie | 2011-10-25 | 2 | -12/+13 |
|\ \
| |/ |
|
| * | refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSit... | Justin Clark-Casey (justincc) | 2011-10-17 | 2 | -10/+9 |
* | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 3 | -15/+3 |
|\ \
| |/ |
|
| * | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 2 | -5/+4 |
* | | Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
|\ \
| |/ |
|
| * | improve method doc on Scene.OtherRegionUp() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+4 |
* | | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+2 |
|\ \
| |/ |
|
| * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -3/+2 |
* | | Merge | Melanie | 2011-10-25 | 2 | -3/+1 |
* | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 2 | -35/+18 |
|\ \
| |/ |
|
| * | fetch physical_prim switch from [Startup] config from inside scene, as is don... | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -38/+17 |
* | | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge | Melanie | 2011-10-25 | 2 | -6/+6 |
|\ \
| |/ |
|
| * | remove now redundant m_physical_prim flag from SOP.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -6/+6 |
* | | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+6 |
|\ \
| |/ |
|
| * | Restore [Startup] physical_prim flag which can stop any prims being subject t... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+6 |
* | | Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+0 |
|\ \
| |/ |
|
| * | remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+0 |
* | | Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmerge | Melanie | 2011-10-25 | 1 | -27/+21 |
|\ \
| |/ |
|
| * | refactor: Remove redundant code in SOP.UpdatePrimFlags() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -27/+21 |
* | | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge | Melanie | 2011-10-25 | 2 | -7/+18 |
|\ \
| |/ |
|
| * | factor common code out into SOP.RemoveFromPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -7/+18 |
* | | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 2 | -3/+3 |
|\ \
| |/ |
|
| * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s... | Justin Clark-Casey (justincc) | 2011-10-14 | 2 | -3/+3 |
* | | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge | Melanie | 2011-10-25 | 1 | -19/+33 |
|\ \
| |/ |
|
| * | Expose minimum frame time and update periods for experimentation. | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -19/+33 |
* | | Merge commit '128d8dfd8b355f84a71e2093e942937ca720c5c6' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
|\ \
| |/ |
|
| * | refactor: Put the frame update period when temporary objects are cleaned up i... | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -4/+4 |
* | | Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmerge | Melanie | 2011-10-25 | 1 | -29/+1 |
|\ \
| |/ |
|
| * | refactor: chain the two scene constructors together to eliminate more copypasta | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -29/+1 |
* | | Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmerge | Melanie | 2011-10-25 | 2 | -6/+13 |
|\ \
| |/ |
|
| * | Tie reported FPS correction factor into the minimum frame time rather than se... | Justin Clark-Casey (justincc) | 2011-10-13 | 2 | -6/+13 |
* | | Merge commit 'ceb326284e49f0817fa0f848136ff60e6f66568f' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+12 |
|\ \
| |/ |
|
| * | Move fps stat adjustment factor into field rather than hard-coded. | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -1/+12 |
* | | Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge | Melanie | 2011-10-25 | 3 | -9/+1 |
|\ \
| |/ |
|
| * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-10-12 | 3 | -44/+1 |
* | | Fix ground sit autopilot | Melanie | 2011-10-25 | 2 | -9/+19 |