| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | ||||
| | * | Add some more code from Avination. This changes physics actor stuff around | Melanie | 2013-02-07 | 2 | -3/+13 |
| | | | | | | | | | to work with the new params. Not actually plumbed just yet. | ||||
| | * | Revert "Add plumbing for physics properties to get to the physics engine." | Melanie | 2013-02-07 | 1 | -5/+0 |
| | | | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a. | ||||
| | * | Add plumbing for physics properties to get to the physics engine. | Robert Adams | 2013-02-07 | 1 | -0/+5 |
| | | | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -3/+3 |
| |\ \ | |/ | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll | ||||
| | * | Change passed PhysicsParameter value from float to the more general string value | Robert Adams | 2013-02-07 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 1 | -0/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| | * | BulletSim: remove degenerate triangles from meshes. This fixes the | Robert Adams | 2013-02-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | invisible barriers in sculptie doorways (Mantis 6529). Bump up level-of-detail for physical meshes to 32 (the max). This fixes the invisible barriers that showed up in prim cut arches. NOTE: the default LOD values are removed from OpenSimDefaults.ini. If you don't change your OpenSimDefaults.ini, you will continue to see the arch problem. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | Bump version and assembly version numbers from 0.7.5 to 0.7.6 | Justin Clark-Casey (justincc) | 2013-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-04 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom | Justin Clark-Casey (justincc) | 2013-02-02 | 1 | -2/+2 |
| | | | |||||
| | * | Add the Avination physics raycast glue so Core Physics can implement raycast | Melanie | 2013-01-23 | 1 | -0/+39 |
| | | | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2013-01-24 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix a type (Suports => Supports). Also put the normal terrain collision check | Melanie | 2013-01-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon) | ||||
| * | | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster | Melanie | 2013-01-16 | 1 | -2/+9 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | | BulletSim: add osGetPhysicsEngineType() LSL function and update | Robert Adams | 2013-01-11 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | the physics engines to return the name that is specified in the INI file ("physics = XXX") as the type of engine. This os function is a little different than the others in that it does not throw an exception of one is not privilaged to use it. It merely returns an empty string. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-01-06 | 1 | -3/+20 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | *TEST* avatar unscripted sit. Some guessing/automation | UbitUmarov | 2013-01-02 | 1 | -2/+19 |
| | | | | |||||
| | * | | fix | UbitUmarov | 2012-12-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-02 | 1 | -1/+1 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate. | Robert Adams | 2012-12-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | Update BulletSim DLLs and SOs with simplier step function interface. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-12-18 | 2 | -2/+32 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | *TESTP unscripted sit: missing files | UbitUmarov | 2012-12-17 | 2 | -0/+6 |
| | | | | |||||
| | * | | fix let other phys plugins work.. broken when added feetOffset | UbitUmarov | 2012-12-11 | 1 | -8/+2 |
| | | | | |||||
| | * | | missing file | UbitUmarov | 2012-12-11 | 1 | -0/+9 |
| | | | | |||||
| | * | | create a new ode character also with the new information | UbitUmarov | 2012-12-07 | 1 | -2/+16 |
| | | | | |||||
| | * | | *TEST* Use new avatar size in ubitODE. | UbitUmarov | 2012-12-07 | 1 | -0/+5 |
| | | | | |||||
| | * | | avatar collision plane send to viewer is only relative to feet. change | UbitUmarov | 2012-12-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | avatar collider, just rounding the boxes, etc | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-12-16 | 1 | -5/+8 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | ||||
| | * | | Return the last set targetVelocity rather than the current velocity as the ↵ | Robert Adams | 2012-12-13 | 1 | -5/+8 |
| | | | | | | | | | | | | | default action made available in PhysicsActor.TargetVelocity. Doesn't change any physics operation but makes DSG work better as the targetVelocity value does not keep moving around. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-11-30 | 2 | -3/+8 |
| |\ \ \ | |/ / | | / | |/ |/| | Conflicts: OpenSim/Region/Physics/Manager/IMesher.cs | ||||
| | * | BulletSim: add expanded call to IMesher/Meshmerizer which enables/disables ↵ | Robert Adams | 2012-11-29 | 2 | -1/+7 |
| | | | | | | | | | mesh caching. Since BulletSim caches and tracks the unmanaged memory version of meshes, the Meshmerizer itself does not need to cache built meshes once BulletSim has made the physical proxy mesh. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | Added AssemblyInfos to every dll in the OpenSim.Region namespace. | Diva Canto | 2012-11-14 | 1 | -1/+1 |
| | | | |||||
| | * | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵ | Diva Canto | 2012-11-13 | 1 | -1/+1 |
| | | | | | | | | | have an AssemblyInfo file. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-01 | 1 | -0/+6 |
| |\ \ | |/ | |||||
| | * | Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵ | Dan Lake | 2012-10-31 | 1 | -0/+6 |
| | | | | | | | | | No change to existing functions. | ||||
| | * | missing changed file | UbitUmarov | 2012-10-18 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | add mesh cache expire on region startup. Expires will be relative to | UbitUmarov | 2012-10-13 | 2 | -0/+2 |
| | | | | | | | | | | | | | previus expire (assumed done only once at startup). File 'cntr' on cache folder stores time. Deleting it will force a skip on expire. Default time is 48hours before previus startup to account for failed ones etc. | ||||
| * | | retouch mesh ids | UbitUmarov | 2012-10-13 | 1 | -1/+1 |
| | | | |||||
| * | | longer meshs identification keys, so first part on disk cache is it's asset id | UbitUmarov | 2012-10-13 | 1 | -1/+3 |
| | | | |||||
| * | | missing file | UbitUmarov | 2012-10-12 | 1 | -0/+6 |
| | | | |||||
| * | | force allocation of mesh data on creation ( messy code version ) | UbitUmarov | 2012-10-09 | 2 | -2/+2 |
| | | | |||||
| * | | move terrain geom to own ode space. Limit range on raycast if includes | UbitUmarov | 2012-10-09 | 1 | -0/+3 |
| | | | | | | | | | | | | | terrain until ode doesn't eat all stack. Add a pre-simulation method to do pending actors changes (except mesh assets still not ready to use), to be optionaly called before firing heartbeat. [UNTESTED] | ||||
| * | | bug fix + make costs visible for testing | UbitUmarov | 2012-10-07 | 1 | -0/+17 |
| | | | |||||
| * | | more changes. Most code not in use | UbitUmarov | 2012-10-04 | 1 | -0/+1 |
| | | | |||||
| * | | missing changed file | UbitUmarov | 2012-10-03 | 1 | -1/+1 |
| | | | |||||
| * | | introduce a ODEMeshWorker class, should be pure cosmetic changes for now | UbitUmarov | 2012-10-03 | 2 | -1/+8 |
| | | | |||||
| * | | use a bit more complex mesh key identifier, plus a bug fix | UbitUmarov | 2012-08-07 | 1 | -0/+12 |
| | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |