| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 | 3 | -7/+3 |
|\ \
| |/ |
|
| * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t... | Justin Clark-Casey (justincc) | 2011-10-15 | 3 | -7/+3 |
* | | Merge | Melanie | 2011-10-25 | 2 | -3/+1 |
* | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 4 | -37/+19 |
|\ \
| |/ |
|
| * | fetch physical_prim switch from [Startup] config from inside scene, as is don... | Justin Clark-Casey (justincc) | 2011-10-15 | 4 | -40/+18 |
* | | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge | Melanie | 2011-10-25 | 3 | -7/+7 |
|\ \
| |/ |
|
| * | remove now redundant m_physical_prim flag from SOP.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 3 | -7/+7 |
* | | 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 | 3 | -11/+19 |
|\ \
| |/ |
|
| * | factor common code out into SOP.RemoveFromPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 3 | -11/+19 |
* | | Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmerge | Melanie | 2011-10-25 | 2 | -53/+36 |
|\ \
| |/ |
|
| * | reduce access to ODECharacter methods to make code analysis easier. Eliminat... | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -54/+36 |
* | | Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmerge | Melanie | 2011-10-25 | 1 | -19/+17 |
|\ \
| |/ |
|
| * | restrict unnecessary access levels on ODEPrim fields/properties | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -19/+17 |
* | | Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge | Melanie | 2011-10-25 | 3 | -129/+195 |
|\ \
| |/ |
|
| * | refactor: make methods that do not need to be public in ODE private or intern... | Justin Clark-Casey (justincc) | 2011-10-15 | 3 | -129/+195 |
* | | Merge commit '4bfc2f5cdea4b739110cae3b37945d88ad527334' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Change hardcoded ODE total frame time to match the default total frame time (... | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -1/+1 |
* | | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 5 | -6/+6 |
|\ \
| |/ |
|
| * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s... | Justin Clark-Casey (justincc) | 2011-10-14 | 5 | -6/+6 |
* | | Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmerge | Melanie | 2011-10-25 | 2 | -88/+125 |
|\ \
| |/ |
|
| * | Extract NullPhysicsScene from PhysicsScene to improve code readability | Justin Clark-Casey (justincc) | 2011-10-14 | 2 | -88/+125 |
* | | Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+5 |
|\ \
| |/ |
|
| * | Don't execute rest of code in XEngine.RemoveRegion() and Close() if the modul... | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -0/+6 |
* | | 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 '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge | Melanie | 2011-10-25 | 3 | -8/+39 |
|\ \
| |/ |
|
| * | More method doc and formatting changes. Makes DestroyOdeStructures() private | Justin Clark-Casey (justincc) | 2011-10-13 | 3 | -8/+39 |
* | | Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge | Melanie | 2011-10-25 | 2 | -91/+79 |
|\ \
| |/ |
|
| * | refactor: move 3x copy/pasted ode structure removal code in ODECharacter into... | Justin Clark-Casey (justincc) | 2011-10-13 | 2 | -91/+79 |
* | | 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 |
* | | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge | Melanie | 2011-10-25 | 2 | -3/+1 |
|\ \
| |/ |
|
| * | Get rid of some traces of the old pre-ROBUST grid architecture config | Justin Clark-Casey (justincc) | 2011-10-12 | 2 | -3/+1 |
* | | Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge | Melanie | 2011-10-25 | 5 | -343/+282 |
|\ \
| |/ |
|