| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'ubitwork' | Melanie | 2012-02-19 | 4 | -2/+86 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | ||||
| | * | changed how vehicle data is stored and passed to physics. use unsafe in ↵ | UbitUmarov | 2012-02-18 | 2 | -3/+47 |
| | | | | | | | | | serializer, tried to control m_dupeInProgress | ||||
| | * | Added simple binary serializer/deserializer to chODE. 100% untested and most ↵ | UbitUmarov | 2012-02-17 | 2 | -0/+12 |
| | | | | | | | | | like still broken | ||||
| | * | Use mesh to estimate real center of prims if avaiable. Let sculpt map ↵ | UbitUmarov | 2012-02-11 | 1 | -0/+1 |
| | | | | | | | | | textures with alpha channel work. On linux J2DecodeCache folder must be deleted to remove bad entries. Corrently this can't be cached on linux (mono/ cairo/? problem) | ||||
| | * | changes in physics manager, needed for UbitODE | UbitUmarov | 2012-02-08 | 2 | -1/+28 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -1/+2 |
| |\ \ | |/ |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | ||||
| | * | On Windows automatically load the correct native ODE library depending on ↵ | Justin Clark-Casey (justincc) | 2012-02-18 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works. | ||||
| | * | Remove unused SetAcceleration and add set on Acceleration parameter | Dan Lake | 2011-12-20 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+2 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Remove unused SetAcceleration and add set on Acceleration parameter | Dan Lake | 2011-12-20 | 1 | -1/+2 |
| | |/ | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 2 | -9/+14 |
| |\ \ | |/ | |||||
| | * | Comment out uncalled OdeScene.UnCombine() | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -8/+2 |
| | | | |||||
| | * | Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of ↵ | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -0/+9 |
| | | | | | | | | | maintaining their own properties | ||||
| | * | Actually remove PhysicsActor.SOPDescription this time | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -6/+10 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| | * | Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ↵ | Justin Clark-Casey (justincc) | 2011-11-16 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId! Instead, just have both subclasses use the PhysicsActor.LocalID property. This restores collision functionality that fell away in 45c7789 yesterday | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 1 | -0/+2 |
| |\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Fix a bug I introduced yesterday in ODE physics where prim scripts would ↵ | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -0/+2 |
| | | | | | | | | | only receive the very first collision. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -23/+24 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| | * | Remove unused fields from CollisionEventUpdate | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -24/+6 |
| | | | |||||
| | * | Get rid of the pointless null checks on collision listeners. Add warning ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+6 |
| | | | | | | | | | about synchronicity for PhysicsActor.OnCollisionUpdate event doc | ||||
| | * | When sending object collision updates, don't null out and recreate the ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+5 |
| | | | | | | | | | CollisionEventUpdate() if the number of collisions falls to zero. Reuse the existing one instead. | ||||
| | * | For ScenePresence collision events, instead of creating a new ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+8 |
| | | | | | | | | | | | | | CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead. This assumes that the listener is using the data synchronously, which is currently the case. | ||||
| * | | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+5 |
| |\ \ | |/ | |||||
| | * | Store scene identifier passed in to OdeScene for later debug messages | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -0/+5 |
| | | | |||||
| * | | Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+0 |
| |\ \ | |/ | |||||
| | * | refactor: make methods that do not need to be public in ODE private or ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+0 |
| | | | | | | | | | internal to aid code reading/analysis. Remove some unused method arguments | ||||
| * | | 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 '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+23 |
| |\ \ | |/ | |||||
| | * | More method doc and formatting changes. Makes DestroyOdeStructures() private | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -2/+23 |
| | | | |||||
| * | | Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+22 |
| |\ \ | |/ | |||||
| | * | refactor: move 3x copy/pasted ode structure removal code in ODECharacter ↵ | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -1/+22 |
| | | | | | | | | | | | | | into a DestroyOdeStructures() method also adds some method doc | ||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 3 | -12/+111 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-29 | 1 | -0/+11 |
| | |\ | |||||
| | | * | Add level of detail specification to optionally reduce the number of ↵ | Robert Adams | 2011-08-28 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | vertices in generated prim meshes Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| | * | | BulletSim: add runtime setting of physics parameters. Update default values. | Robert Adams | 2011-08-18 | 1 | -0/+73 |
| | |/ | |||||
| | * | refactor: centralize prim geom removal code from four places to one | Justin Clark-Casey (justincc) | 2011-08-01 | 1 | -0/+4 |
| | | | |||||
| | * | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts | Dan Lake | 2011-07-20 | 1 | -14/+0 |
| | | | |||||
| | * | Fix some local id issues in physics glue | root | 2011-07-15 | 1 | -12/+7 |
| | | | |||||
| | * | Port implementation of llCastRay() from Aurora. | Justin Clark-Casey (justincc) | 2011-07-12 | 1 | -1/+23 |
| | | | | | | | | | I haven't been able to test this since the viewer won't parse the llCastRay() function. Maybe some activation cap is missing. Could wait until it is activated by default in the viewer. | ||||
| * | | Fox some local id issues in physics glue | Melanie | 2011-07-15 | 1 | -12/+7 |
| | | | |||||
| * | | Revert "Add localid support to ch0de properly" | Melanie | 2011-07-15 | 1 | -7/+12 |
| | | | | | | | | | This reverts commit bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d. | ||||
| * | | Add localid support to ch0de properly | Tom | 2011-07-15 | 1 | -12/+7 |
| |/ | |||||
| * | minor: commented out log lines for future use and very small code tidy | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -1/+4 |
| | | |||||
| * | Add localID to physical object creation functions. | Mic Bowman | 2011-06-15 | 2 | -1/+21 |
| | | |||||
| * | adding configurable j2kDecodeCache path | BlueWall | 2010-09-26 | 2 | -3/+4 |
| | | | | | | | | | allowing the decoded sculpt map cache path to be defined in the configuration files. Use DecodedSculpMapPath in the [Startup] section to set the path. The default is still ./bin/j2kDecodeCache | ||||
| * | Revolution is on the roll again! :) | Revolution | 2010-02-14 | 2 | -2/+16 |
| | | | | | | | | | Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events). Direct flames and kudos to Revolution, please Signed-off-by: Melanie <melanie@t-data.com> | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |