| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
|\ |
|
| * | Comment out the uuid gatherer lines that I accidentally left in. | Justin Clark-Casey (justincc) | 2011-10-23 | 1 | -4/+4 |
* | | Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Fix missing Busy-Mode Response | Pixel Tomsen | 2011-10-22 | 1 | -0/+1 |
* | | Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+3 |
|\ \
| |/ |
|
| * | Add case to Lightshare/Windlight | BlueWall | 2011-10-22 | 1 | -0/+3 |
* | | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 2 | -16/+48 |
|\ \
| |/ |
|
| * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -16/+48 |
* | | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+5 |
|\ \
| |/ |
|
| * | refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAss... | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -5/+5 |
* | | Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+3 |
|\ \
| |/ |
|
| * | very minor removal of old commented out line of code in OdeScene | Justin Clark-Casey (justincc) | 2011-10-21 | 1 | -5/+3 |
* | | Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+0 |
|\ \
| |/ |
|
| * | remove unnecessary null check on _collisionEventPrim | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -3/+0 |
* | | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge | Melanie | 2011-10-25 | 3 | -25/+32 |
|\ \
| |/ |
|
| * | Get OdeScene to use passed in time step rather than hard-coded 0.089 | Justin Clark-Casey (justincc) | 2011-10-20 | 3 | -25/+32 |
* | | 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 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge | Melanie | 2011-10-25 | 2 | -13/+5 |
|\ \
| |/ |
|
| * | For now, stop passing timeStep into methods where it's not actually used. | Justin Clark-Casey (justincc) | 2011-10-20 | 2 | -13/+5 |
* | | Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Change wording on asset requests. | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+2 |
* | | 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 | 5 | -318/+318 |
|\ \
| |/ |
|
| * | Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line e... | Dan Lake | 2011-10-19 | 5 | -318/+318 |
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-10-19 | 2 | -72/+100 |
| |\ |
|
* | \ | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 9 | -344/+319 |
|\ \ \
| |/ / |
|
| * | | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... | Dan Lake | 2011-10-19 | 9 | -344/+319 |
* | | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge | Melanie | 2011-10-25 | 2 | -41/+118 |
|\ \ \
| | |/
| |/| |
|
| * | | Extend scripts stop/start/suspend/resume console commands to allow action on ... | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -72/+100 |
| |/ |
|
| * | Add "scripts stop" and "scripts start" console commands. | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+48 |
| * | minor: improve command help on scripts suspend/resume | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+5 |
* | | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge | Melanie | 2011-10-25 | 2 | -22/+54 |
|\ \
| |/ |
|
| * | Fix resume scripts. | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -9/+33 |
* | | Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge | Melanie | 2011-10-25 | 2 | -4/+52 |
|\ \
| |/ |
|
| * | Add "scripts suspend" and "scripts resume" commands. | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -3/+53 |
* | | Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | on log and "show scripts" messages, show script item UUID rather than asset UUID | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -4/+4 |
* | | Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge | Melanie | 2011-10-25 | 3 | -7/+31 |
|\ \
| |/ |
|
| * | add current script status to "scripts show" command (running, suspended, etc.) | Justin Clark-Casey (justincc) | 2011-10-19 | 3 | -7/+31 |
* | | Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+28 |
|\ \
| |/ |
|
| * | Add "show scripts" command to show all scripts currently known to the script ... | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -2/+28 |
* | | Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+6 |
|\ \
| |/ |
|
| * | Temporarily put in log lines to record time taken to set terrain in OdeScene. | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -0/+6 |
* | | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+10 |
|\ \
| |/ |
|
| * | Store scene identifier passed in to OdeScene for later debug messages | Justin Clark-Casey (justincc) | 2011-10-18 | 2 | -2/+10 |
* | | Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge | Melanie | 2011-10-25 | 1 | -16/+13 |
|\ \
| |/ |
|
| * | Don't bother taking OdeLock during OdeScene construction, since there can be ... | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -16/+13 |
* | | Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmerge | Melanie | 2011-10-25 | 1 | -18/+13 |
|\ \
| |/ |
|