aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics (follow)
Commit message (Collapse)AuthorAgeFilesLines
* More 'everything is a module' merging.Robert Adams2015-09-0825-28936/+0
| | | | | | Have most of UbitOde converted. There are compile errors in OpenSimBase as the new modules stuff is not all there. Removed ChOdePlugin as it's connection to OdePlugin was tangled.
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-08107-49082/+0
|\ | | | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1
| * Major renaming of Physics dlls / folders. No functional changes, just renames.Diva Canto2015-08-30107-48778/+0
| |
* | actually reduce max number of ode spacesUbitUmarov2015-09-042-8/+8
| |
* | bug fix on ode spaces and allow more of them on large regionsUbitUmarov2015-09-042-12/+12
| |
* | remove a forgotten 1000.9 factor on physics fpsUbitUmarov2015-09-044-4/+4
| |
* | normalise physics plugins to return fps as (simulated time / requested ↵UbitUmarov2015-09-046-1906/+3319
| | | | | | | | simulation time). improved a bit old ode simulations per call math
* | a bit better addAvatar() call chainUbitUmarov2015-09-031-5/+1
| |
* | make addavatar more friendly between pluginsUbitUmarov2015-09-032-3330/+1891
| |
* | seems to compile ( tests comented out)UbitUmarov2015-09-0210-51/+35
| |
* | bad merge?UbitUmarov2015-09-0140-274/+29560
|\ \ | |/ |/|
| * fix slow moving physical objects moving without sending updatesUbitUmarov2015-08-311-9/+9
| |
| * ubitode a bit more friendly for megas (still disabled)UbitUmarov2015-08-201-171/+49
| |
| * make basic ode work with var regions for contribution back to CORE. ( avnUbitUmarov2015-08-202-152/+147
| | | | | | | | partial compatibility code needs to be reverted). Cant fully test.
| * make it compatible with avn, no point making avn compatible with itUbitUmarov2015-08-203-6/+30
| |
| * update old git to os core versionUbitUmarov2015-08-204-60/+55
| |
| * another funny bug (mine this time)UbitUmarov2015-08-191-2/+2
| |
| * ubitode varsize ( Mega disabled till better checks )UbitUmarov2015-08-191-54/+101
| |
| * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-293-7/+33
| | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
| * fix axis locking AmotorUbitUmarov2015-02-131-6/+6
| |
| * name the threadUbitUmarov2014-10-131-0/+1
| |
| * try to reduce avatar bounce on falls. Not all possible side effectsUbitUmarov2014-10-121-25/+19
| | | | | | | | checked, specially on portals
| * reduce some avatar engine strenghtUbitUmarov2014-10-051-9/+10
| |
| * try to help steps climb a bit compensating the bounce reductionUbitUmarov2014-10-041-0/+2
| |
| * remove check of other prim top height on steps climb codeUbitUmarov2014-09-291-3/+4
| |
| * change avatar physics and motion control. Still not that good :(UbitUmarov2014-09-292-57/+320
| |
| * fix building state logic...UbitUmarov2014-09-231-2/+2
| |
| * avatar collisions fixUbitUmarov2014-07-211-51/+54
| |
| * change ava to ava collisions a bitUbitUmarov2014-07-211-30/+42
| |
| * bug fixUbitUmarov2014-07-211-4/+5
| |
| * fix physics sit for physical child primsUbitUmarov2014-07-201-4/+4
| |
| * Merge branch 'avination-current'Melanie Thielker2014-07-1914-1488/+608
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| | * revert to capsule representation of avatar colliderUbitUmarov2014-07-191-297/+28
| | |
| | * reduce avatar hover in basic ode pluginUbitUmarov2014-07-181-1/+1
| | |
| | * retouch prim stopped condition testUbitUmarov2013-05-291-3/+3
| | |
| | * removed spurius ref to ode.dll from odeapiUbitUmarov2013-05-291-1/+1
| | |
| | * correction to previus comment: all parameters but gravity modifier haveUbitUmarov2013-05-291-1/+0
| | | | | | | | | | | | efect on all prims.
| | * let gravity modifier, friction, restitution and density changes be appliedUbitUmarov2013-05-292-6/+65
| | | | | | | | | | | | | | | | | | | | | to prim. Only have efect on root prim. Density doesn't get effect imediatly, only on next change of size or shape. density change implies a full body rebuild to be done later, after reducing the number of sets sop does. Other parameters should work. **** mainly untested ***
| | * make sure friction slip parameters are zero ( or other value ) and notUbitUmarov2013-05-291-3/+3
| | | | | | | | | | | | default cmf
| | * missing fileUbitUmarov2013-05-291-0/+5
| | |
| | * missing filesUbitUmarov2013-05-292-5/+6
| | |
| | * *** DANGER TESTING **** changed prims mesh generation hopefully removingUbitUmarov2013-05-299-1178/+503
| | | | | | | | | | | | | | | | | | | | | spurius faces. CHanged several aspects. Fixed prims inertia that was too low, still using box as model. Increased number of quickstep SOR iterations to 15. Keep it 15 even on heavy load ( will only jump simulation time).
| * | Merge branch 'master' into careminsterMelanie2014-01-281-7/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ Intermediate commit. Sill errors.Melanie2014-01-051-8/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-12-071-8/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-086-19/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-032-2/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-10-067-7/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-10-0418-197/+1313
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-09-012-3/+47
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs