| 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 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+40 |
|\ \
| |/ |
|
| * | Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line e... | Dan Lake | 2011-10-19 | 1 | -0/+40 |
* | | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+3 |
|\ \
| |/ |
|
| * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... | Dan Lake | 2011-10-19 | 1 | -3/+3 |
* | | 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 | 1 | -2/+0 |
* | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+10 |
|\ \
| |/ |
|
| * | fetch physical_prim switch from [Startup] config from inside scene, as is don... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+9 |
* | | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+1 |
|\ \
| |/ |
|
| * | factor common code out into SOP.RemoveFromPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -2/+1 |
* | | 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 | 1 | -3/+4 |
|\ \
| |/ |
|
| * | Tie reported FPS correction factor into the minimum frame time rather than se... | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -3/+4 |
* | | Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+0 |
|\ \
| |/ |
|
| * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-10-12 | 1 | -36/+0 |
* | | Fake an AgentCircuitData if none is available rather than crashing out | Melanie | 2011-10-24 | 1 | -2/+24 |
* | | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge | Melanie | 2011-10-12 | 1 | -13/+0 |
|\ \
| |/ |
|
| * | refactor: have lsl and ossl interrogate scene.StatsReporter directly rather t... | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -13/+0 |
* | | Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge | Melanie | 2011-10-12 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Fixed line endings from previous commit | Dan Lake | 2011-10-06 | 1 | -2/+2 |
* | | Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge | Melanie | 2011-10-12 | 1 | -13/+6 |
|\ \
| |/ |
|
| * | Refactored "known child region" in ScenePresence. There were 4 different | Dan Lake | 2011-10-06 | 1 | -13/+6 |
* | | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+12 |
|\ \
| |/ |
|
| * | Instead of adding stat agentMS in all kinds of places, calculate it instead i... | Justin Clark-Casey (justincc) | 2011-10-06 | 1 | -1/+12 |
* | | Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge | Melanie | 2011-10-12 | 1 | -8/+18 |
|\ \
| |/ |
|
| * | Make reported sim fps more accurate, in line with frame time ms | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -8/+18 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-03 | 1 | -45/+42 |
| |\ |
|
* | \ | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+1 |
|\ \ \
| |/ / |
|
| * | | Removed redundant code in AttachmentsModule and simplified interfaces which c... | Dan Lake | 2011-10-03 | 1 | -1/+1 |
* | | | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge | Melanie | 2011-10-11 | 1 | -40/+44 |
|\ \ \
| | |/
| |/| |
|
| * | | Remove vestigal RegionStatus.SlaveScene. | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -45/+42 |
| |/ |
|
* | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+3 |
|\ \
| |/ |
|
| * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -3/+3 |
* | | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+67 |
|\ \
| |/ |
|
| * | Move code which handles NPC movement into Scene so that this can also be used... | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -0/+67 |
* | | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge | Melanie | 2011-10-11 | 1 | -82/+0 |
|\ \
| |/ |
|
| * | Correctly create a freshly created estate owner's default items and avatar en... | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -82/+0 |
* | | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+1 |
|\ \
| |/ |
|