aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* BulletSim: fix buoyancy for prims. Start of configurable physics parameters.Robert Adams2011-07-225-17/+92
|
* Merge branch 'bulletsim' of ssh://opensimulator.org/var/git/opensim into ↵Dan Lake2011-07-220-0/+0
|\ | | | | | | bulletsim
| * Pass collisions and updates in pinned memory (saves marshaling).Dan Lake2011-07-228-98/+157
| | | | | | | | | | Fix folding feet by using collision normals. Add constraint specification.
* | Pass collisions and updates in pinned memory (saves marshaling).Robert.Adams2011-07-228-98/+157
|/ | | | | Fix folding feet by using collision normals. Add constraint specification.
* Merge branch 'master' into bulletsimMic Bowman2011-07-2210-68/+126
|\
| * Thank you, Michelle Argus, for a patch that adds reading the agent limitMelanie2011-07-221-1/+4
| | | | | | | | from XML properly.
| * Generate the initial maptile asynchronouslyOren Hurvitz2011-07-222-15/+17
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimroot2011-07-215-41/+31
| |\
| | * remove the windows debugging symbols for the long protobuf-netJustin Clark-Casey (justincc)2011-07-211-0/+0
| | |
| | * remove dead MXP default symbols. The MXP code is long, long gone.Justin Clark-Casey (justincc)2011-07-211-0/+0
| | |
| | * make [SMTP] default comment option match actual defaultJustin Clark-Casey (justincc)2011-07-212-10/+10
| | |
| | * minor: group all the map tile options togetherJustin Clark-Casey (justincc)2011-07-212-15/+16
| | |
| | * remove pointless quotes from GenerateMaptiles option in OpenSimDefaults.iniJustin Clark-Casey (justincc)2011-07-211-1/+4
| | |
| | * minor: remove the pointless quotes from the GenerateMaptiles optionJustin Clark-Casey (justincc)2011-07-211-1/+1
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-07-213-18/+3
| | |\
| | * | make default TextureOnMapTile true for the older map imagerJustin Clark-Casey (justincc)2011-07-212-3/+3
| | | | | | | | | | | | | | | | Don't know of a good reason not to do this, seems to work fine.
| * | | When an uncached asset is requested multiple times concurrently, only load ↵Oren Hurvitz2011-07-211-9/+49
| | | | | | | | | | | | | | | | | | | | | | | | it once Signed-off-by: root <root@grid00001.t-data.com>
| * | | When handling SetAppearance packet, always save the appearance; not only if ↵Oren Hurvitz2011-07-211-5/+5
| | | | | | | | | | | | | | | | the texture was changed
| * | | Fixed updating avatar appearanceOren Hurvitz2011-07-212-11/+20
| | | | | | | | | | | | | | | | Signed-off-by: root <root@grid00001.t-data.com>
* | | | Merge branch 'bulletsim' of ssh://opensimulator.org/var/git/opensim into ↵Dan Lake2011-07-201-14/+14
|\ \ \ \ | | | | | | | | | | | | | | | bulletsim
| * | | | reorder bulletsim and convex decomposition projects in prebuild.xml. seemsMic Bowman2011-07-121-16/+16
| | | | | | | | | | | | | | | | | | | | to fix the build on mono/linux.
| * | | | Moved ConvexDecompositionDotNet.dll to bin directory to fix picky references ↵Dan Lake2011-07-110-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | on Linux
| | * | | | Moved ConvexDecompositionDotNet.dll to bin directory to fix picky references ↵Mic Bowman2011-07-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | on Linux
| * | | | | Moved ConvexDecompositionDotNet.dll to bin directory to fix picky references ↵Dan Lake2011-07-111-2/+2
| |/ / / / | | | | | | | | | | | | | | | on Linux
* | | | | Merge branch 'master' into bulletsimDan Lake2011-07-2049-826/+1445
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflictsDan Lake2011-07-201-14/+0
| |/ /
| * | Apply the localID to the Physics actor to prevent null calls laterCareminster Team2011-07-191-3/+3
| | |
| * | Tidy up a superfluous AddPrimShape override in PhysicsSceneCareminster Team2011-07-191-1/+0
| |/
| * On all undo/redo operations, consistently lock the undo object for ↵Justin Clark-Casey (justincc)2011-07-191-5/+1
| | | | | | | | everything, in order to avoid any deadlock issues.
| * If we store an undo, wipe anything already present on the redo stackJustin Clark-Casey (justincc)2011-07-191-0/+3
| | | | | | | | | | This stops problems when we undo a few steps and start off down another path. Surprisingly, apart from this now fixed problem, redo appears to be working too.
| * stop redo throwing an exception if there is nothing to redoJustin Clark-Casey (justincc)2011-07-191-10/+13
| |
| * refator: simplify UndoState.Compare() codeJustin Clark-Casey (justincc)2011-07-191-20/+9
| |
| * rip out pointless null checks in UndoState where part can never be nullJustin Clark-Casey (justincc)2011-07-191-81/+72
| |
| * Fix undo when changing just the root prim's position in a linkset.Justin Clark-Casey (justincc)2011-07-193-9/+11
| | | | | | | | | | | | I think (ha ha) this largely fixes undo, except for the fact that rotation a set of prims with 'edit linked parts' selected doesn't quite work properly (though this works fine if the checkbox isn't selected). Also, the double undo bug for resize is still present. Redo might be incredibly buggy, haven't even looked at that yet.
| * refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for ↵Justin Clark-Casey (justincc)2011-07-193-6/+6
| | | | | | | | consistency
| * comment out all kinds of debugging guffJustin Clark-Casey (justincc)2011-07-194-44/+44
| |
| * Fix undo for rotation of the root prim in a linkset on its own.Justin Clark-Casey (justincc)2011-07-192-8/+15
| | | | | | | | The only obviously broken things right now are the undo of the position of just a root prim (stays in place) and the fact that resizes need two undoes.
| * Fix undo of rotation of single prims in a linksetJustin Clark-Casey (justincc)2011-07-192-9/+11
| |
| * Fix undo of prim group rotation.Justin Clark-Casey (justincc)2011-07-193-24/+34
| | | | | | | | | | This isn't that great since I think I broke it a few commits earlier. Undo of rotation of individual prims in a linkset is still broken
| * Rename UpdatePrimRotation() to UpdatePrimGroupRotation() since this is what ↵Justin Clark-Casey (justincc)2011-07-192-7/+11
| | | | | | | | it actually does and is more consistent with other method names.
| * Stop undo of just the root prim position in the linkset from shifting the ↵Justin Clark-Casey (justincc)2011-07-194-14/+20
| | | | | | | | | | | | whole linkset. However, what happens now is that undo just doesn't do anything when the root prim is selected on its own. This requires more code than just fiddling with undo states.
| * fix undo when resizing of non-root individual prims in a linksetJustin Clark-Casey (justincc)2011-07-193-4/+11
| | | | | | | | undo resize, rotation and position still needs fixing when only editing root prim of a linkset
| * Fix undo for resizing linksetsJustin Clark-Casey (justincc)2011-07-194-41/+85
| | | | | | | | | | | | This involves implementing a boolean in UndoState to signal whether the undo needs to be done for an entire group/linkset or just a single prim Resizing individual components of linksets is still dodgy. Resizing still has to be down twice, since for some reason the client is sending two multiobjectupdate packets on every resize except the very first. This applies to single prims and linksets. Need to look into this.
| * remove undo state storage in a few places where it's pointlessJustin Clark-Casey (justincc)2011-07-192-5/+1
| | | | | | | | no functional effect - existing bugs still remain
| * Make various tweaks to undo code in an effort to get things working better.Justin Clark-Casey (justincc)2011-07-186-56/+217
| | | | | | | | | | | | | | Undo rotation and position appear to be working. Resizing a single prim appears to be working, though the undo has to be done twice. Resizing a group of prims still does not work properly - possibly because in the UndoState we don't store a knowledge of when we're resizing a whole group rather than individual prims. This needs to be addressed.
| * use standard sdk stack in terrain model rather than OpenSim.Framework.UndoStack.Justin Clark-Casey (justincc)2011-07-182-153/+1
| | | | | | | | remove OpenSim.Framework.UndoStack
| * Use a standard generic system stack for the undo/redo stacks instead of our ↵Justin Clark-Casey (justincc)2011-07-183-3/+55
| | | | | | | | | | | | | | own homebrew. system stack also uses an array, so no performance penalty. Also exposes undo count and adds a test assertion for correct undo count after resize
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-07-186-11/+32
| |\
| | * refactor: Pull up Assembly of the SQLite classes as a protected property, so ↵Marck2011-07-166-11/+32
| | | | | | | | | | | | that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is a refactor similar to commit 9923a2ff1002d722ccebea8bf4d71718ed4e2a03 for MySQL -- no functional changes.
| * | refactor: group all the undo/redo code in SOP into one place for easier code ↵Justin Clark-Casey (justincc)2011-07-181-59/+62
| |/ | | | | | | reading
generated by cgit v1.1 at 2024-11-16 03:20:50 +0000