Commit Graph

  • 44834408c8 Merge branch 'master' into SceneCombiner_Memory_Leaks Scott Baldric 2021-04-23 09:00:12 -05:00
  • 21d7085be6 Merge pull request #3794 from assimp/kimkulling-patch-1 Kim Kulling 2021-04-23 15:30:30 +02:00
  • 0b14eb7523 Fix formatter. Kim Kulling 2021-04-23 15:30:12 +02:00
  • 9dc66b0003 removed dead code Krishty 2021-04-23 15:15:21 +02:00
  • 4db4e7206d Update Readme.md Kim Kulling 2021-04-23 15:14:38 +02:00
  • 359fcadd87 Merge branch 'master' into SceneCombiner_Memory_Leaks Scott Baldric 2021-04-23 08:14:26 -05:00
  • 574ea5acf9 Merge pull request #3793 from assimp/kimkulling-codacy_batch Kim Kulling 2021-04-23 15:13:55 +02:00
  • 196deea7ce added missing file extensions to aiImporterDesc::mFileExtensions Krishty 2021-04-23 15:05:09 +02:00
  • 31438a03a6 Add Codacy Badge Kim Kulling 2021-04-23 14:52:31 +02:00
  • 4b47b7a552 Merge branch 'master' into SceneCombiner_Memory_Leaks Scott Baldric 2021-04-23 07:42:32 -05:00
  • c8ad1cb078 Merge pull request #3763 from krishty/strip-useless-gltf-write Kim Kulling 2021-04-22 21:34:24 +02:00
  • aae3788247 Fix: Removing double delete of texture items. Scott Baldric 2021-04-22 08:49:47 -05:00
  • 8881e65d62 Merge branch 'master' into strip-useless-gltf-write Kim Kulling 2021-04-22 09:55:00 +02:00
  • 44dc08f128 Remove GLTF tag, postprocessing is format independent Max Vollmer (Microsoft Havok) 2021-04-21 16:20:58 +01:00
  • 746d5cf964 * Throw instead of assert on invalid file input * Check JSON object type before accessing members * Ensure samplers input and output references are set before accessing them Max Vollmer (Microsoft Havok) 2021-04-21 16:17:03 +01:00
  • 6027c10969 Merge pull request #3776 from krishty/fix-import-export-confusion Kim Kulling 2021-04-20 20:39:00 +02:00
  • 873c6ffabe Merge branch 'master' into fix-import-export-confusion Kim Kulling 2021-04-19 21:08:52 +02:00
  • 55dd5faafb fixed export exceptions on import Krishty 2021-04-19 19:33:41 +02:00
  • 0643786288 Add PBRT to exportable file formats list Tobias Rittig 2021-04-19 15:27:59 +02:00
  • 0af558a11c Merge pull request #3774 from krishty/version-string-fix Kim Kulling 2021-04-19 13:20:26 +02:00
  • 930cc25c0e fixed version string test Krishty 2021-04-19 09:51:44 +02:00
  • 3fead344ad updated version string (if anyone cares) Krishty 2021-04-19 07:37:12 +02:00
  • a19299d501 moved MD2/MDC tables from BSS to const data Krishty 2021-04-17 00:32:04 +02:00
  • f761dc72f4 style fix - initializing and assigning empty std::string properly Krishty 2021-04-16 23:43:56 +02:00
  • 6cbeca5518 fixed glTF export stuff being pulled into the EXE even if building with ASSIMP_BUILD_NO_EXPORT Krishty 2021-04-16 20:44:40 +02:00
  • cd42b9954b Merge pull request #3757 from mahiuchun/tr1 Kim Kulling 2021-04-14 13:03:51 +02:00
  • 21b56b0058 Merge branch 'master' into tr1 Kim Kulling 2021-04-14 12:46:59 +02:00
  • 83c0dce075 Merge branch 'master' into Q1MDLgroup Kim Kulling 2021-04-14 10:48:26 +02:00
  • c282b9a775 Merge pull request #3742 from Garux/patch-1 Kim Kulling 2021-04-14 10:47:34 +02:00
  • 0b61a8875a Merge branch 'master' into patch-1 Kim Kulling 2021-04-14 10:22:42 +02:00
  • bbfefd89d7 Merge pull request #3758 from assimp/kimkulling-update-assimp.net Kim Kulling 2021-04-14 09:37:20 +02:00
  • bef2304c53 Update repo for assimp-net Kim Kulling 2021-04-14 08:55:55 +02:00
  • 4aa52b3af8 Flip the check on _MSC_VER for using TR1 containers. Hill Ma 2021-04-13 11:15:52 -07:00
  • 182418e818 Merge pull request #3755 from assimp/kimkulling-issue3754 Kim Kulling 2021-04-12 23:31:06 +02:00
  • a6e4672df1 Fix a typo. Kim Kulling 2021-04-12 23:19:00 +02:00
  • d1eeb80e1a Not resize empty vectors. Kim Kulling 2021-04-12 21:05:46 +02:00
  • c9ba616eb6 Merge pull request #3708 from urschanselmann/master Kim Kulling 2021-04-12 11:50:12 +02:00
  • 263d450300 Merge branch 'master' into master Kim Kulling 2021-04-12 09:35:03 +02:00
  • 67fa0a13bc Merge pull request #3749 from pcwalton/ms3d-fixes Kim Kulling 2021-04-11 20:37:31 +02:00
  • a3ee377af7 Merge branch 'master' into ms3d-fixes Kim Kulling 2021-04-11 19:12:06 +02:00
  • cf4ef04a80 Merge branch 'master' into master Kim Kulling 2021-04-07 20:58:40 +02:00
  • 6eae925441 Merge pull request #3695 from AllegorithmicSAS/feature/gltf_fb_ngon_encoding Kim Kulling 2021-04-07 20:52:05 +02:00
  • e66232d8c3 Merge branch 'master' into feature/gltf_fb_ngon_encoding Clement JACOB 2021-04-07 13:54:31 +02:00
  • a44ba41413 Fix incorrect indices in the MilkShape 3D loader Patrick Walton 2021-04-05 19:14:48 -07:00
  • d51fce9e70 Merge pull request #3748 from assimp/kimkulling-issue_3747 Kim Kulling 2021-04-05 21:37:48 +02:00
  • 7fee914776 Fix direct leak Kim Kulling 2021-04-05 21:24:54 +02:00
  • 4eb69d1e54 Merge pull request #3746 from BaldricS/rename_PI_to_avoid_macro_convention Kim Kulling 2021-04-05 18:40:27 +02:00
  • 31e8042071 Renaming PI to aiPi. Scott Baldric 2021-04-05 09:59:22 -05:00
  • 856547be23 Fix Q1 MDL group frame loading, e.g. Q1 progs/flame2.mdl Garux 2021-04-05 17:06:49 +03:00
  • 437d7bf8b8 Fix MDC loader Garux 2021-04-05 16:39:41 +03:00
  • 06a60c43cf Merge pull request #3739 from assimp/kimkulling-patch-7 Kim Kulling 2021-04-04 20:46:43 +02:00
  • 010c0853ea Update INSTALL Kim Kulling 2021-04-04 14:40:50 +02:00
  • eb261c6581 Merge pull request #3718 from MalcolmTyrrell/MalcolmTyrrell/tangentCheck Kim Kulling 2021-04-03 18:28:03 +02:00
  • 22413d85ad Merge branch 'master' into MalcolmTyrrell/tangentCheck Kim Kulling 2021-04-03 17:42:44 +02:00
  • cfad36d0f4 Merge pull request #3737 from assimp/615IO-ios-port-update Kim Kulling 2021-04-03 17:41:07 +02:00
  • 7d68eab4a7 Update license Kim Kulling 2021-04-03 12:09:23 +02:00
  • d677005487 Merge branch '615IO-ios-port-update' Kim Kulling 2021-04-03 12:08:38 +02:00
  • 0b628a0ebb Merge branch 'ios-port-update' of https://github.com/615IO/assimp into 615IO-ios-port-update Kim Kulling 2021-04-03 12:04:03 +02:00
  • 456af8c493 Merge pull request #3736 from assimp/issue_3678 Kim Kulling 2021-04-03 11:23:17 +02:00
  • 80fc8538be Update AMFImporter_Material.cpp Kim Kulling 2021-04-03 10:29:16 +02:00
  • d62c89557b Remove dead code Kim Kulling 2021-04-03 10:28:19 +02:00
  • 46e49d0b83 Update AMFImporter_Geometry.cpp Kim Kulling 2021-04-03 10:27:54 +02:00
  • cdb6a62cdb Merge branch 'master' into issue_3678 Kim Kulling 2021-04-03 10:27:07 +02:00
  • da0543972b Fix parsing for AMF-Files. Kim Kulling 2021-04-03 10:25:03 +02:00
  • 89a8f87dae AMF: Remove unused macros Kim Kulling 2021-04-02 13:10:24 +02:00
  • 91cb2947ac Merge pull request #3723 from eliasdaler/master Kim Kulling 2021-04-01 21:05:58 +02:00
  • a25ef8a329 Merge branch 'master' into feature/gltf_fb_ngon_encoding Clement JACOB 2021-04-01 20:35:16 +02:00
  • 18af013c9e Merge branch 'master' into master Kim Kulling 2021-04-01 20:02:53 +02:00
  • 577a8fc186 Merge pull request #3728 from assimp/kimkulling-patch-4 Kim Kulling 2021-04-01 19:23:51 +02:00
  • 658ffe3d2c Update FUNDING.yml Kim Kulling 2021-04-01 17:21:12 +02:00
  • 20e3261304 Merge pull request #3727 from assimp/kimkulling-patch-4 Kim Kulling 2021-04-01 17:20:38 +02:00
  • 60794f3743 Update Readme.md Kim Kulling 2021-04-01 17:07:35 +02:00
  • 5d09105a49 Update mesh.h Clement JACOB 2021-03-30 20:24:03 +02:00
  • fc2c12ad6a Fixing encoding when lines and points are encountered Clement Jacob 2021-03-30 09:58:28 +02:00
  • fc0cf2ea8d NGON encoding triangles only Clement Jacob 2021-03-30 09:19:50 +02:00
  • 2e90fed527 Refactoring and fixing remaining issues in triangulation process Clement Jacob 2021-03-30 09:06:51 +02:00
  • 596001c89c Refactoring the extension Clement Jacob 2021-03-29 19:03:01 +02:00
  • 81019d5e58 Fixing quad encoding Clement Jacob 2021-03-29 15:31:48 +02:00
  • 6d1a0c6054 Adding quad proper handling Clement Jacob 2021-03-29 15:20:40 +02:00
  • 8e589221d7 [gltf2-exporter] Adding FB_ngon_encoding support Clement Jacob 2021-03-10 09:48:12 +01:00
  • 3880cd225c Merge pull request #3721 from vfxgordon/fbxBlendshapes Kim Kulling 2021-03-29 22:31:37 +02:00
  • f61a41bdd9 Merge branch 'master' into fbxBlendshapes Kim Kulling 2021-03-29 21:48:51 +02:00
  • b5d4e50895 Merge pull request #3724 from bekraft/3ds-import-fix Kim Kulling 2021-03-29 20:34:55 +02:00
  • 09d3266250 Fixing 3DS import for CHUNK_TRMATRIX translation vector. Bernold Kraft 2021-03-29 15:31:08 +02:00
  • 0bd938c024 Add zlibstatic to the list of exported targets Elias Daler 2021-03-29 02:26:03 +03:00
  • 5755530bab Merge branch 'master' into master urschanselmann 2021-03-28 17:40:17 +02:00
  • e5862c18be Merge branch 'master' into fbxBlendshapes Kim Kulling 2021-03-28 13:02:35 +02:00
  • b7df376836 Merge pull request #3722 from bekraft/bekraft/3ds-export-fix Kim Kulling 2021-03-27 19:53:38 +01:00
  • 348c34811f Fixing CHUNK_TRMATRIX translation sub chunk Bernold Kraft 2021-03-26 22:21:45 +01:00
  • 3fd865b4bf Added Blendshape Support to FBX Export Gordon Chapman 2021-03-24 18:10:03 -07:00
  • d94ddd32b1 Extra check. Better logging. Malcolm Tyrrell 2021-03-24 11:04:39 +00:00
  • add165c4a1 Check target sizes to avoid reading beyond allocation Malcolm Tyrrell 2021-03-24 10:55:40 +00:00
  • d1ef28fa52 Merge pull request #3716 from assimp/kimkulling-issue_2063 Kim Kulling 2021-03-22 09:12:52 +01:00
  • 2c5fd39176 Provide a dockerfile Kim Kulling 2021-03-22 08:55:21 +01:00
  • 0a1efe5d58 Merge branch 'master' into master urschanselmann 2021-03-21 17:19:43 +01:00
  • 525213a045 Merge pull request #3707 from MalcolmTyrrell/MalcolmTyrrell/gltfCrashes Kim Kulling 2021-03-21 12:14:37 +01:00
  • 86c05a1154 Merge branch 'master' into master urschanselmann 2021-03-19 18:15:15 +01:00
  • 5f652feb75 Merge branch 'master' into MalcolmTyrrell/gltfCrashes Kim Kulling 2021-03-19 13:35:13 +01:00
  • 608b48e1fc Merge pull request #3696 from jaefunk/export_with_rotation Kim Kulling 2021-03-19 12:34:51 +01:00
  • 18886686e1 Merge branch 'master' into export_with_rotation Kim Kulling 2021-03-19 08:21:36 +01:00