aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-134-0/+0
|\
| * BulletSim: fix density since the simulator/viewer track density in aRobert Adams2013-02-124-0/+0
| | | | | | | | | | | | | | | | | | | | | | funny unit that is 100 times real density (default 1000). Fix avatar drifting slowly when stationary flying. Fix for physical prims getting corrected for being under terrain when it was just its geometric center that was below terrain. Add PreUpdatePropertyAction allowing plugable modifiction of phys parameters returned from Bullet. Fix an exception setting GravityMultiplier on initialization. Update DLLs and SOs for good measure (no functional change).
* | Merge branch 'master' into careminsterMelanie2013-02-121-0/+0
|\ \ | |/
| * Replaced Ionic.Zip.dll with a new one that fixes a bug in it. DotNetZip ↵Diva Canto2013-02-121-0/+0
| | | | | | | | (from which Ionic.Zip.dll is derived) is now a fork in opensim-libs, forked from 1.9.1.8 and added that simple bug fix.
* | Merge branch 'master' into careminsterMelanie2013-02-104-0/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations
| * BulletSim: add parameter to set global contact breaking threshold. Update ↵Robert Adams2013-02-084-0/+0
| | | | | | | | DLLs and SOs for setting same.
* | Merge branch 'master' into careminsterMelanie2013-02-082-0/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * Adds size limits to JsonStore. Adds a separate configurationMic Bowman2013-02-081-0/+4
| | | | | | | | variable to enable binding to dynamic attributes.
* | Merge branch 'master' into careminsterMelanie2013-02-072-2901/+2901
|\ \ | |/ | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| * * Adds Websocket support to baseHttpServer and IHttpServer.cs . This ↵teravus2013-02-076-29/+6
| |\ | | | | | | | | | allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
| * | This is the final commit that enables the Websocket handlerteravus2013-02-072-0/+0
| | |
| * | We're not really done here.. but we're getting there. Socket Read is ↵teravus2013-02-053-2901/+2901
| | | | | | | | | | | | working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
* | | Merge branch 'master' into careminsterMelanie2013-02-061-0/+4
|\ \ \ | | |/ | |/|
| * | minor: Add explanation of MaptileStaticUUID setting in Regions.ini.exampleJustin Clark-Casey (justincc)2013-02-061-0/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2013-02-065-14/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | BulletSim: make removing zero width triangles from meshes optionalRobert Adams2013-02-052-0/+0
| | | | | | | | | | | | and, for the moment, default to 'off'.
| * | BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-051-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | BulletSim: rework some parameter setting implementation moving functionality ↵Robert Adams2013-02-054-0/+0
| | | | | | | | | | | | that was in BSScene to BSParam. Remove unused parameters that were passed to the unmanaged code. Update DLLs and SOs for the new param block.
* | | Merge branch 'master' into careminsterMelanie2013-02-042-4/+4
|\ \ \ | |/ /
| * | Remove [XMLRPC] section I added by accident to the top of ↵Justin Clark-Casey (justincc)2013-02-041-15/+0
| |/ | | | | | | OpenSimDefaults.ini in previous commit 95883282
| * Stop exceptions being thrown if GenerateMapTiles = false but no static map ↵Justin Clark-Casey (justincc)2013-02-022-3/+18
| | | | | | | | tile has been set. Do more informative warn instead.
* | Merge branch 'master' into careminsterMelanie2013-01-311-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add config option to Regions.ini for new maptile featureBlueWall2013-01-301-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-01-314-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * BulletSim: do not zero an avatar's standing velocity if it is standingRobert Adams2013-01-284-0/+0
| | | | | | | | | | | | | | on a moving object. Rearrange pre/post action subscription code to put more in locks. Add meshmerizer params to BulletSimTestUtil scene creation (and fix line endings). Rebuilt version of DLLs and SOs with cleaned up code and no profiling for sure.
| * BulletSim: update Bullet with profiling disabled. This seems to fix the ↵Robert Adams2013-01-284-0/+0
| | | | | | | | memory leak problem.
* | Merge branch 'master' into careminsterMelanie2013-01-255-1/+377
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * Add JSONification of WebStats module. Adds a '?json' query parameterRobert Adams2013-01-243-1/+377
| | | | | | | | | | | | to the fetch URL to return the data in JSON format. Also adds a simple 'sim.html' that uses JavaScript to display the JSON data. Not pretty but an example.
| * * Repairs the Object updates, Collision updates, and Child Prim methods ↵teravus2013-01-242-0/+0
| | | | | | | | | | | | making the bulletXNA engine work again. * The only thing that had an issue was when creating a new RigidBody, BulletXNA didn't know the type SimMotionState and the upcast type is unknown in the constructor. Therefore, I had to update the IMotionState with a new method 'SetBody'. All of the duplicated type information has been removed and BulletXNA is not relying on any non-standard types external to the library.
* | Merge branch 'master' into careminsterMelanie2013-01-244-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-01-232-13/+31
| |\
| * | BulletSim: pass up and report the real collision penetration.Robert Adams2013-01-234-0/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-242-13/+31
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-243-0/+25
| |\ \ | | |/
| * | Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini ↵Justin Clark-Casey (justincc)2013-01-232-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and OpenSim.ini.example. Default remains abort. This setting controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) co-op should be more stable but this option is experimental. If moving from co-op to abort, existing script DLLs will need to be recompiled. This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/ One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
* | | Merge branch 'master' into careminsterMelanie2013-01-233-0/+25
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| * | This updates prebuild to remove BulletSimN, implements the BulletSim API in ↵teravus2013-01-203-0/+14
| | | | | | | | | | | | BulletSPlugin using the BulletXNA Bullet physics engine. It also updates the BulletXNA library to be compatible with the changes. OpenSimDefaults has been updated to describe how to switch engines and terrain implementations.
| * | IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in ↵PixelTomsen2013-01-191-0/+11
| |/ | | | | | | | | | | | | | | OpenSimDefaults.ini / section [IRC] http://opensimulator.org/mantis/view.php?id=6470 idea: https://github.com/ssm2017/IrcBridgeAlert
* | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-161-8/+0
|\ \ | |/
| * BulletSim: by default, turn on continuious collision detection (CCD)Robert Adams2013-01-151-8/+0
| | | | | | | | | | and enable friction computation caching. Remove dangerous BulletSim settings from OpenSimDefaults.ini.
* | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-164-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * BulletSim: move center of gravity of linkset to its geometric center.Robert Adams2013-01-114-0/+0
| | | | | | | | | | | | | | Necessitated allowing simulator and physical position of a body to get out of sync since Bullet assumes that <0,0,0> is the center of mass. Update DLLs and SOs for the UpdateChildTransform so positions of individual prim in a linkset can be implemented.
* | Merge branch 'master' into careminsterMelanie2013-01-104-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * BulletSim: update DLLs and SOs with better debugging output.Robert Adams2013-01-064-0/+0
| | | | | | | | | | Add definition of hand crafted avatar mesh. Not used yet. Comments and cleanup.
* | Merge branch 'master' into careminsterMelanie2013-01-064-0/+0
|\ \ | |/
| * BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnosticRobert Adams2013-01-044-0/+0
| | | | | | | | | | functions. If values set from console, the functions are called. Looking for why the collision pools fill up with unnecessary stuff.
* | Merge branch 'master' into careminsterMelanie2013-01-025-2/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-014-0/+0
| |\
| | * BulletSim: eliminate the use of the unmanaged HeightMapInfo structure.Robert Adams2012-12-314-0/+0
| | | | | | | | | | | | | | | Remove all related calls from the unmanaged and BSAPITemplate interfaces. Update DLLs and SOs to include the version without HeightMapInfo structures.
| | * BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate.Robert Adams2012-12-314-0/+0
| | | | | | | | | | | | Update BulletSim DLLs and SOs with simplier step function interface.
generated by cgit v1.1 at 2024-12-17 23:36:53 +0000