aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing (follow)
Commit message (Collapse)AuthorAgeFilesLines
* bad merge?UbitUmarov2015-09-013-26/+133
|\
| * Merge branch 'avination-current'Melanie Thielker2014-07-191-0/+5
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| | * missing fileUbitUmarov2013-05-291-0/+5
| | |
| * | Merge branch 'master' into careminsterMelanie2013-12-071-8/+8
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-11-081-5/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-251-3/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit '440905ad14d4261df9da0fd2ce7e20a350982af1' into careminsterMelanie2013-05-251-53/+83
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-241-6/+78
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-241-21/+110
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-161-0/+4
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | | | | | | | | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-051-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
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-301-6/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/Manager/IMesher.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-301-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | add mesh cache expire on region startup. Expires will be relative toUbitUmarov2012-10-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | | | force allocation of mesh data on creation ( messy code version )UbitUmarov2012-10-092-1/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | refix so we can compile it, loosing alpha scultps fix on core meshmerizerUbitUmarov2012-10-071-0/+11
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix wrong file commitedUbitUmarov2012-10-071-10/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'avination' into ubitworkUbitUmarov2012-10-071-24/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| | * | | | | | | | | | | | | | | comment out a spam coment on core MeshmerizerUbitUmarov2012-10-071-26/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | more changes. Most code not in useUbitUmarov2012-10-041-0/+6
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | introduce a ODEMeshWorker class, should be pure cosmetic changes for nowUbitUmarov2012-10-031-0/+5
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | ** DANGER someone should stress test more ** release unused physics meshs, ↵UbitUmarov2012-08-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including unmanaged memory allocations (allocated by managed code)
| * | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-07-161-143/+183
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | | | | | | | | | | | Downgrade an error log message to info because there is nothing we can do ifMelanie2012-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an asset is damaged so it should not spew red ink.
| * | | | | | | | | | | | | | | | Merge branch 'ubitwork'Melanie2012-03-201-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | let convex be a parameter to createMesh so it can be used. Was forced to add ↵UbitUmarov2012-03-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it also to original mesher code and zeromesher
| * | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | | | | | | | | | | | | | Merge branch 'ubitwork'Melanie2012-02-193-29/+126
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
| | * | | | | | | | | | | | | | | | | Use mesh to estimate real center of prims if avaiable. Let sculpt map ↵UbitUmarov2012-02-113-29/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures with alpha channel work. On linux J2DecodeCache folder must be deleted to remove bad entries. Corrently this can't be cached on linux (mono/ cairo/? problem)
* | | | | | | | | | | | | | | | | | | lock collision mesh cache when accessingdahlia2015-05-031-3/+9
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Make Meshmerizer mesh cache static so it can be shared across class instancesdahlia2015-05-031-1/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Updated all occurrences of AssemblyVersion("0.8.1.*") to ↵Diva Canto2015-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AssemblyVersion("0.8.2.*")
* | | | | | | | | | | | | | | | | | | Change assembly versions to 0.8.1Justin Clark-Casey (justincc)2014-06-171-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | apparently mono DeflateStream has no CopyTo method =(dahlia2013-12-061-1/+5
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | use System.IO.Compression.DeflateStream for mesh decompression in an attempt ↵dahlia2013-12-061-9/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to reduce mesh asset decoding failures
* | | | | | | | | | | | | | | | | add null check for jpeg2000 sculpt image decode failure. Note: the ↵dahlia2013-11-011-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | j2kDecodeCache folder should be cleared after updating to this revision so that sculpts containing alpha can be re-decoded and successfully meshed.
* | | | | | | | | | | | | | | | | discard alpha in 4-plane sculpt textures before generating physics proxy meshdahlia2013-11-011-12/+7
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Meshmerizer: remember to add the copied hull verts to the list of hulls.Robert Adams2013-05-241-0/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Meshmerizer: add INI parameter to enable DEBUG mesh detail logging.Robert Adams2013-05-241-3/+6
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to off. To turn mesh parsing DEBUG detail logging on, add [Mesh] LogMeshDetail=true to the INI file.
* | | | | | | | | | | | | | change a hull debugging message to Debug instead of Infodahlia2013-05-241-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | correct some errors in decoding of mesh asset convex decomposition datadahlia2013-05-241-53/+83
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | add decoder for bounding convex hulldahlia2013-05-231-4/+53
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add DEBUG level logging in Meshmerizer for mesh parsing. There isRobert Adams2013-05-231-2/+25
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a compile time variable to turn this logging off if it is too spammy.
* | | | | | | | | | | | fix error in hull point indexingdahlia2013-05-181-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | remove duplicate hull scalingdahlia2013-05-181-3/+3
| | | | | | | | | | | |
generated by cgit v1.1 at 2025-02-02 02:39:20 +0000