Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'master' into bulletsim | Dan Lake | 2011-07-20 | 11 | -114/+176 | |
| |\ \ | | |/ | ||||||
| | * | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts | Dan Lake | 2011-07-20 | 1 | -14/+0 | |
| | | | ||||||
| | * | Apply the localID to the Physics actor to prevent null calls later | Careminster Team | 2011-07-19 | 1 | -3/+3 | |
| | | | ||||||
| | * | Fix physics proxy regeneration when a mesh with more than one submesh is resized | Justin Clark-Casey (justincc) | 2011-07-16 | 2 | -1/+5 | |
| | | | | | | | | | | | | Addresses http://opensimulator.org/mantis/view.php?id=5584 | |||||
| | * | Fix some local id issues in physics glue | root | 2011-07-15 | 8 | -54/+14 | |
| | | | ||||||
| | * | Port implementation of llCastRay() from Aurora. | Justin Clark-Casey (justincc) | 2011-07-12 | 3 | -18/+126 | |
| | | | | | | | | | | | | 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. | |||||
| | * | temporarily fix the build break with building the OdePlugin tests assembly. | Justin Clark-Casey (justincc) | 2011-07-12 | 1 | -2/+3 | |
| | | | | | | | | | | | | This needs to be fixed properly. | |||||
| | * | minor: remove whitespace to trigger another build | Justin Clark-Casey (justincc) | 2011-07-12 | 1 | -1/+0 | |
| | | | ||||||
| | * | When a mesh object is added to a scene, delay adding the physics actor until ↵ | Justin Clark-Casey (justincc) | 2011-07-12 | 2 | -25/+29 | |
| | | | | | | | | | | | | | | | | | | the sculpt data has been added to the shape (possibly via an async asset service request) This prevents spurious 'no asset data' for meshes added on startup. | |||||
| * | | Merge branch 'master' into bulletsim | Dan Lake | 2011-07-11 | 5 | -3923/+3998 | |
| |\ \ | | |/ | ||||||
| | * | minor Tack the prim name on the end of the "experimental mesh proxy ↵ | Justin Clark-Casey (justincc) | 2011-07-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | generation" message. Can probably comment out this message soon, once a few other issues are tidied up. | |||||
| | * | When a sculpt/mesh texture is received by a part on a callback request, ↵ | Justin Clark-Casey (justincc) | 2011-07-11 | 2 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | don't do the unnecessary work of copying the base shape. Just setting the new base shape is enough to reinsert the sculpt data and set the taint. Also cleans up a few more left-in debugging messages. | |||||
| | * | comment out accidential ProcessTaints physics debug line left in code | Justin Clark-Casey (justincc) | 2011-07-11 | 1 | -1/+1 | |
| | | | ||||||
| * | | BulletSim initial checkin | Robert Adams | 2011-06-20 | 29 | -0/+9055 | |
| | | | ||||||
* | | | Fox some local id issues in physics glue | Melanie | 2011-07-15 | 10 | -65/+20 | |
| | | | ||||||
* | | | Revert "Add localid support to ch0de properly" | Melanie | 2011-07-15 | 10 | -20/+65 | |
| | | | | | | | | | | | | This reverts commit bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d. | |||||
* | | | Add localid support to ch0de properly | Tom | 2011-07-15 | 10 | -65/+20 | |
| | | | ||||||
* | | | Fix a raycast issue | Tom | 2011-07-15 | 2 | -4/+20 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-09 | 5 | -3922/+3980 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | minor: code tidy and inserted log lines for future use. | Justin Clark-Casey (justincc) | 2011-07-09 | 3 | -24/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory When phantom is toggled, the sculptdata is regenerated before remeshing. But on resize, the sculptdata is not regenerated. So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled. | |||||
| * | | refactor: eliminate redundant return statement | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -3/+1 | |
| | | | ||||||
| * | | refactor: Factor out AddSubMesh() method from long ↵ | Justin Clark-Casey (justincc) | 2011-07-08 | 2 | -49/+58 | |
| | | | | | | | | | | | | | | | | | | CraeteMeshFromPrimMesher() method Also remove some of the logging spam left in from the last commit. | |||||
| * | | Fix interpretation of physics mesh proxies from mesh data | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | As per http://wiki.secondlife.com/wiki/Mesh/Mesh_Asset_Format, some submesh blocks may just have the flag "NoGeometry" to signal that they provide no mesh data. If a block contains this, ignore it for meshing purposes rather than suffer a ClassCastException This fixes physics proxy meshing, so you can now walk through mesh doorways, properly stand on the trailer of mesh trucks, etc. To get mesh physics proxy, the UseMeshiesPhysicsMesh must be true in a [Mesh] config section in OpenSim.ini (example in OpenSimDefaults.ini). Convex hull physics not currently supported. | |||||
| * | | minor: code tidy up - remove a couple of Console.WriteLine() accidentally ↵ | Justin Clark-Casey (justincc) | 2011-07-08 | 2 | -53/+23 | |
| | | | | | | | | | | | | added in the last commit | |||||
| * | | refactor: Separate the OdeScene class into its own file from OdePlugin.cs, ↵ | Justin Clark-Casey (justincc) | 2011-07-08 | 2 | -3825/+3873 | |
| | | | | | | | | | | | | to improve code readability | |||||
| * | | minor: commented out log lines for future use and very small code tidy | Justin Clark-Casey (justincc) | 2011-07-08 | 4 | -5/+14 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 2 | -5/+21 | |
|\ \ \ | |/ / | ||||||
| * | | Allow physics proxy generation for meshes using new asset format. | dahlia | 2011-06-29 | 2 | -5/+21 | |
| |/ | | | | | | | Fix an invalid cast exception while decoding new mesh asset format. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-20 | 2 | -1/+21 | |
|\ \ | |/ | ||||||
| * | Add localID to physical object creation functions. | Mic Bowman | 2011-06-15 | 2 | -1/+21 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-11 | 1 | -1/+5 | |
|\ \ | |/ | ||||||
| * | partial update for new mesh asset format - handle both old and new formats ↵ | dahlia | 2011-06-10 | 1 | -1/+5 | |
| | | | | | | | | for physics mesh | |||||
* | | Implement llGodLikeRezObject and llGetUsedMemory | Melanie | 2011-05-22 | 1 | -1/+2 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -1/+2 | |
|\ \ | |/ | ||||||
| * | Fix crash when [Mesh] section is missing from configuration files | Dan Lake | 2011-04-29 | 1 | -1/+2 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -1/+2 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-21 | 1 | -3/+10 | |
| |\ | ||||||
| * | | Group collada meshies settings under [Mesh] in OpensimDefaults.ini | BlueWall | 2011-04-21 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -3/+10 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | fix meshing failure on sculpt maps smaller than 64x64 | dahlia | 2011-04-19 | 1 | -3/+10 | |
| |/ | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 2 | -0/+6 | |
|\ \ | |/ | ||||||
| * | force mesh proxy for simple box prims with path cut | dahlia | 2011-04-12 | 2 | -0/+6 | |
| | | ||||||
* | | Comment a very spammy debug message that was being output directly to console. | Melanie | 2011-01-28 | 1 | -1/+1 | |
| | | | | | | | | | | My last fox that makes bumping into sim borders/bans work makes this spam endlessly. | |||||
* | | Fix drift of static prim. | Kitto Flora | 2011-01-20 | 1 | -1/+13 | |
| | | ||||||
* | | Revise Materials properties; Fix Double-Click Autopilot; Allow non-script ↵ | Kitto Flora | 2011-01-04 | 2 | -227/+209 | |
| | | | | | | | | sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message. | |||||
* | | Fix av/prim eject problem. | Kitto Flora | 2010-12-29 | 1 | -45/+60 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-25 | 1 | -0/+5 | |
|\ \ | |/ | ||||||
| * | This fixes mantis #5198 and related. Physics is not my expertise, so I'm not ↵ | Diva Canto | 2010-12-24 | 1 | -0/+5 | |
| | | | | | | | | 100% sure of what all the consequences of this change are. Pushing up, so others can take a look. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 1 | -0/+19 | |
|\ \ | |/ | ||||||
| * | * Re-Adding Scene TimeDilation to Object Update Packets. | Teravus Ovares (Dan Olivares) | 2010-12-23 | 1 | -0/+19 | |
| | | | | | | | | | | | | * Added Calculating Time Dilation in the OdePlubin * When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise. * Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent. |