| Commit message (Expand) | Author | Age | Files | Lines |
* | BulletSim: fix buoyancy for prims. Start of configurable physics parameters. | Robert Adams | 2011-07-22 | 5 | -17/+92 |
* | Merge branch 'bulletsim' of ssh://opensimulator.org/var/git/opensim into bull... | Dan Lake | 2011-07-22 | 0 | -0/+0 |
|\ |
|
| * | Pass collisions and updates in pinned memory (saves marshaling). | Dan Lake | 2011-07-22 | 8 | -98/+157 |
* | | Pass collisions and updates in pinned memory (saves marshaling). | Robert.Adams | 2011-07-22 | 8 | -98/+157 |
|/ |
|
* | Merge branch 'master' into bulletsim | Mic Bowman | 2011-07-22 | 10 | -68/+126 |
|\ |
|
| * | Thank you, Michelle Argus, for a patch that adds reading the agent limit | Melanie | 2011-07-22 | 1 | -1/+4 |
| * | Generate the initial maptile asynchronously | Oren Hurvitz | 2011-07-22 | 2 | -15/+17 |
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | root | 2011-07-21 | 5 | -41/+31 |
| |\ |
|
| | * | remove the windows debugging symbols for the long protobuf-net | Justin Clark-Casey (justincc) | 2011-07-21 | 1 | -0/+0 |
| | * | remove dead MXP default symbols. The MXP code is long, long gone. | Justin Clark-Casey (justincc) | 2011-07-21 | 1 | -0/+0 |
| | * | make [SMTP] default comment option match actual default | Justin Clark-Casey (justincc) | 2011-07-21 | 2 | -10/+10 |
| | * | minor: group all the map tile options together | Justin Clark-Casey (justincc) | 2011-07-21 | 2 | -15/+16 |
| | * | remove pointless quotes from GenerateMaptiles option in OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2011-07-21 | 1 | -1/+4 |
| | * | minor: remove the pointless quotes from the GenerateMaptiles option | Justin Clark-Casey (justincc) | 2011-07-21 | 1 | -1/+1 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-07-21 | 3 | -18/+3 |
| | |\ |
|
| | * | | make default TextureOnMapTile true for the older map imager | Justin Clark-Casey (justincc) | 2011-07-21 | 2 | -3/+3 |
| * | | | When an uncached asset is requested multiple times concurrently, only load it... | Oren Hurvitz | 2011-07-21 | 1 | -9/+49 |
| * | | | When handling SetAppearance packet, always save the appearance; not only if t... | Oren Hurvitz | 2011-07-21 | 1 | -5/+5 |
| * | | | Fixed updating avatar appearance | Oren Hurvitz | 2011-07-21 | 2 | -11/+20 |
* | | | | Merge branch 'bulletsim' of ssh://opensimulator.org/var/git/opensim into bull... | Dan Lake | 2011-07-20 | 1 | -14/+14 |
|\ \ \ \ |
|
| * | | | | reorder bulletsim and convex decomposition projects in prebuild.xml. seems | Mic Bowman | 2011-07-12 | 1 | -16/+16 |
| * | | | | Moved ConvexDecompositionDotNet.dll to bin directory to fix picky references ... | Dan Lake | 2011-07-11 | 0 | -0/+0 |
| |\ \ \ \ |
|
| | * | | | | Moved ConvexDecompositionDotNet.dll to bin directory to fix picky references ... | Mic Bowman | 2011-07-11 | 1 | -2/+2 |
| * | | | | | Moved ConvexDecompositionDotNet.dll to bin directory to fix picky references ... | Dan Lake | 2011-07-11 | 1 | -2/+2 |
| |/ / / / |
|
* | | | | | Merge branch 'master' into bulletsim | Dan Lake | 2011-07-20 | 49 | -826/+1445 |
|\ \ \ \ \
| |/ / / /
|/| | | /
| | |_|/
| |/| | |
|
| * | | | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts | Dan Lake | 2011-07-20 | 1 | -14/+0 |
| |/ / |
|
| * | | Apply the localID to the Physics actor to prevent null calls later | Careminster Team | 2011-07-19 | 1 | -3/+3 |
| * | | Tidy up a superfluous AddPrimShape override in PhysicsScene | Careminster Team | 2011-07-19 | 1 | -1/+0 |
| |/ |
|
| * | On all undo/redo operations, consistently lock the undo object for everything... | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -5/+1 |
| * | If we store an undo, wipe anything already present on the redo stack | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -0/+3 |
| * | stop redo throwing an exception if there is nothing to redo | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -10/+13 |
| * | refator: simplify UndoState.Compare() code | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -20/+9 |
| * | rip out pointless null checks in UndoState where part can never be null | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -81/+72 |
| * | Fix undo when changing just the root prim's position in a linkset. | Justin Clark-Casey (justincc) | 2011-07-19 | 3 | -9/+11 |
| * | refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for consis... | Justin Clark-Casey (justincc) | 2011-07-19 | 3 | -6/+6 |
| * | comment out all kinds of debugging guff | Justin Clark-Casey (justincc) | 2011-07-19 | 4 | -44/+44 |
| * | Fix undo for rotation of the root prim in a linkset on its own. | Justin Clark-Casey (justincc) | 2011-07-19 | 2 | -8/+15 |
| * | Fix undo of rotation of single prims in a linkset | Justin Clark-Casey (justincc) | 2011-07-19 | 2 | -9/+11 |
| * | Fix undo of prim group rotation. | Justin Clark-Casey (justincc) | 2011-07-19 | 3 | -24/+34 |
| * | Rename UpdatePrimRotation() to UpdatePrimGroupRotation() since this is what i... | Justin Clark-Casey (justincc) | 2011-07-19 | 2 | -7/+11 |
| * | Stop undo of just the root prim position in the linkset from shifting the who... | Justin Clark-Casey (justincc) | 2011-07-19 | 4 | -14/+20 |
| * | fix undo when resizing of non-root individual prims in a linkset | Justin Clark-Casey (justincc) | 2011-07-19 | 3 | -4/+11 |
| * | Fix undo for resizing linksets | Justin Clark-Casey (justincc) | 2011-07-19 | 4 | -41/+85 |
| * | remove undo state storage in a few places where it's pointless | Justin Clark-Casey (justincc) | 2011-07-19 | 2 | -5/+1 |
| * | Make various tweaks to undo code in an effort to get things working better. | Justin Clark-Casey (justincc) | 2011-07-18 | 6 | -56/+217 |
| * | use standard sdk stack in terrain model rather than OpenSim.Framework.UndoStack. | Justin Clark-Casey (justincc) | 2011-07-18 | 2 | -153/+1 |
| * | Use a standard generic system stack for the undo/redo stacks instead of our o... | Justin Clark-Casey (justincc) | 2011-07-18 | 3 | -3/+55 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-07-18 | 6 | -11/+32 |
| |\ |
|
| | * | refactor: Pull up Assembly of the SQLite classes as a protected property, so ... | Marck | 2011-07-16 | 6 | -11/+32 |
| * | | refactor: group all the undo/redo code in SOP into one place for easier code ... | Justin Clark-Casey (justincc) | 2011-07-18 | 1 | -59/+62 |
| |/ |
|