| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2012-06-06 | 1 | -7/+17 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Fix land collisions to work like SL. | Melanie | 2012-06-05 | 1 | -6/+16 |
| | | | |||||
| | * | Actually trigger land collisions in the root even when a child collides | Melanie | 2012-06-04 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-05-31 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Fix collision filtering | Melanie | 2012-05-29 | 1 | -10/+10 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-05-31 | 1 | -9/+9 |
| |\ \ | |||||
| | * | | Fix collision filtering. The filter should be checked on the receiving part! | Melanie | 2012-05-29 | 1 | -9/+9 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-27 | 1 | -22/+86 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | missing update script events call | UbitUmarov | 2012-05-20 | 1 | -1/+12 |
| | | | | |||||
| | * | | a bit faster collision sound type verification plus a few fixes/changes | UbitUmarov | 2012-05-19 | 1 | -20/+60 |
| | | | | |||||
| | * | | modulate collision sound intensity with collision relative velocity for ↵ | UbitUmarov | 2012-05-19 | 1 | -16/+29 |
| | | | | | | | | | | | | | parts also | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-17 | 1 | -5/+40 |
| |\ \ \ | |/ / | |||||
| | * | | trigger collision sounds on active agent position for better spatial effect ↵ | UbitUmarov | 2012-05-17 | 1 | -16/+4 |
| | | | | | | | | | | | | | without using the detailed collision position. (current error will be half max physical prim size). Moved some checks from sop to collisionSound code | ||||
| | * | | default colisionVolume is 0, use it only for user specified sound | UbitUmarov | 2012-05-17 | 1 | -3/+6 |
| | | | | |||||
| | * | | default collision sounds. Incomplete, untested, needs revision | UbitUmarov | 2012-05-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | collision sounds: simplify send code a bit and limit sending rate to 5 per ↵ | UbitUmarov | 2012-05-16 | 1 | -1/+36 |
| | | | | | | | | | | | | | sec per part ??? | ||||
| | * | | Added a invalidCollisionSoundUUID so that scripts can stop all collision ↵ | UbitUmarov | 2012-05-16 | 1 | -4/+13 |
| | | | | | | | | | | | | | sounds with llCollisionSound("",...). UUID.Zero means defaults should be used. In case part has several scripts with confliting llCollisionSound result depende on exec order. Specially on reset the efect of "" depends on reset order, it should override the others. This is intermediate improve(?) since collisions sounds seem to need a deaper revision. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-16 | 1 | -1/+12 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-05-15 | 1 | -501/+184 |
| | |\ \ | |||||
| | * | | | Fix issue where loading OARs could sometimes result in link numbers being ↵ | Justin Clark-Casey (justincc) | 2012-05-15 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reordered. This was because the parts in scene objects were sometimes not serialized in link order. This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this had not been done in the SerialiserModule methods that OAR loading used. Add regression test for same. Addresses http://opensimulator.org/mantis/view.php?id=5948, http://opensimulator.org/mantis/view.php?id=5749 | ||||
| * | | | | Merge branch 'avination' into careminster | Melanie | 2012-05-15 | 1 | -50/+124 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | | use part VolumeDetectActive and not rootPart.VolumeDetectActive to be ↵ | UbitUmarov | 2012-05-15 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | coerent with other places in case of future changes. Should be equivalent if all is well. | ||||
| | * | | | sop colisions don't play sounds on volume detectors | UbitUmarov | 2012-05-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | sop: - added UpdatePhysicsSubscribedEvents() to update physics ator ↵ | UbitUmarov | 2012-05-15 | 1 | -48/+118 |
| | | | | | | | | | | | | | | | | | collision events subcription where needed. Made it consider also VolumeDtc and phantom cases. - added extra calls to it on physics ator proprieties changes. - Fixed land collisions reports. - Handle the case of physics sending a last zero colisions reports to trigger collision_end. - Made the physics collisions report rate be 20 per second. (needs review/testing) | ||||
| | * | | | Port the mel/dahlia fix | Melanie | 2012-05-15 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | don't send colision events to volume detectors | UbitUmarov | 2012-05-15 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Fix an omission | Melanie | 2012-05-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-05-15 | 1 | -1/+4 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | | | Guard against null root part on SQLite. This really needs to be fixed so SQLite | Melanie | 2012-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | loads roots before children like MySQL does. | ||||
| | * | | | Try to fix sqlite breakage | Melanie | 2012-05-15 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Port Avination's collision fixes to core. | Melanie | 2012-05-15 | 1 | -501/+181 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-14 | 1 | -501/+171 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Completely revamp collision handling. Now works as it is supposed to. | Melanie | 2012-05-14 | 1 | -501/+171 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-09 | 1 | -4/+5 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | ||||
| | * | | Remove physics actor related race conditions in SetVehicleFlags() and ↵ | Justin Clark-Casey (justincc) | 2012-05-09 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | SetPhysicsAxisRotation() sop.PhysActor can currently become null at any time. | ||||
| * | | | Merge branch 'avination' | Melanie | 2012-05-02 | 1 | -0/+3 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Preserve attachment rotation on objects rezzed via a script. Makes toasters | Melanie | 2012-05-02 | 1 | -0/+3 |
| | | | | | | | | | | | | | work right, finally. | ||||
| * | | | Merge branch 'avination' | Melanie | 2012-04-29 | 1 | -3/+37 |
| |\ \ \ | |/ / | |||||
| | * | | fix llGetCenterOfMass ( checked with ubitODE only) | UbitUmarov | 2012-04-28 | 1 | -3/+37 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-23 | 1 | -0/+14 |
| |\ \ \ | |/ / | | | | | | | careminster | ||||
| | * | | changed seletion code. SOP now knows about parts selection. UI actions are ↵ | UbitUmarov | 2012-04-20 | 1 | -0/+14 |
| | | | | | | | | | | | | | sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-23 | 1 | -1/+0 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | | Fix bug where setting phantom on a prim would result in a server log message ↵ | Justin Clark-Casey (justincc) | 2012-04-22 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | rather than setting phantom. This was an oversight when removing some race conditions from PhysicsActor setting recently. Regression tests extended to probe this code path. Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-22 | 1 | -3/+6 |
| |\ \ \ | |/ / | | / | |/ |/| | |||||
| | * | Add regression test for prim status when root prim in a new linkset is ↵ | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -1/+1 |
| | | | | | | | | | non-physical | ||||
| | * | Add TestSetPhysics() to SOP status tests | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -3/+6 |
| | | | |||||
| * | | changed - VolumeDetect and phantom setting interaction. Script VD(true) ↵ | UbitUmarov | 2012-04-19 | 1 | -11/+28 |
| | | | | | | | | | forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics. | ||||
| * | | make llGetGeometricCenter() work as in current SL. Now this is not real geom ↵ | UbitUmarov | 2012-04-09 | 1 | -9/+20 |
| | | | | | | | | | center but a average of positions relative to root prim ignoring prims details, so no need to use physics engine. | ||||
| * | | sop.AddToPhysics(..) fixed and in use. For now it seems it needs to set ↵ | UbitUmarov | 2012-04-09 | 1 | -263/+147 |
| | | | | | | | | | sop.PhysActor, so made it return void. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 1 | -22/+60 |
| |\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |