Commit Graph

11325 Commits (9e0261ea7a8fe3a0e2b51825217fe362a9809a70)

Author SHA1 Message Date
kimmi d3c8201614 Fix token match string checks. 2022-06-28 20:31:03 +02:00
Kim Kulling b6f3c8eb15
Merge pull request #4595 from assimp/kimkulling/fix-doc
Update name of package
2022-06-28 18:04:22 +02:00
Kim Kulling 2de95c77a4
Update name of package
- closes https://github.com/assimp/assimp/issues/4594
2022-06-28 17:48:06 +02:00
Kim Kulling 33b672288c
Merge pull request #4542 from hgdagon/master
Fix GNUC check on Windows
2022-06-24 11:02:25 +02:00
Kim Kulling 5598356157
Merge branch 'master' into master 2022-06-24 09:56:09 +02:00
Kim Kulling 6cebe2c1f1
Merge pull request #4581 from Gargaj/w32fix
Fix Windows 32-bit builds
2022-06-24 09:04:47 +02:00
Kim Kulling 855537f232
Merge branch 'master' into master 2022-06-24 09:04:37 +02:00
Kim Kulling be2e6a1b24
Merge branch 'master' into w32fix 2022-06-24 08:31:41 +02:00
Kim Kulling 038ae8c028
Merge pull request #4585 from onurtore/otore19/sandbox
Utilizies AI_CONFIG_IMPORT_REMOVE_EMPTY_BONES flag for Collada meshes.
2022-06-23 16:03:02 +02:00
Onur Berk Töre b392ff5ad1
Merge branch 'master' into otore19/sandbox 2022-06-21 21:34:50 +03:00
Onur Berk Tore 4f06c41802
Fix: Collada header updated 2022-06-21 21:08:11 +03:00
Kim Kulling 3f3f4dc6b7
Merge pull request #4534 from tanolino/patch-2
Inifinite loop on bad import files
2022-06-21 14:01:18 +02:00
Gargaj bca5650578 fix windows 32 bit builds 2022-06-21 13:40:49 +02:00
Kim Kulling fff74a4ac0
Merge branch 'master' into patch-2 2022-06-21 13:39:23 +02:00
Kim Kulling ad2a1546eb
Merge pull request #4584 from kovacsv/delete_unused_variable
Remove unused variable.
2022-06-21 13:38:08 +02:00
Onur Berk Tore c2060a1f7e
Deletion: Removed unnessary header 2022-06-20 23:48:00 +03:00
Onur Berk Tore 1b53f41787
Feature: Utilizes removeEmptyBones flag for Collada 2022-06-20 23:46:29 +03:00
kovacsv 2486a681c1 Remove unused variable. 2022-06-20 21:07:34 +02:00
Kim Kulling 67fe6643c3
Merge pull request #4578 from PercentBoat4164/master
Add support for GCC v12
2022-06-20 00:03:59 +02:00
PercentBoat4164 487a9aca2f Add support for GCC v12 2022-06-16 19:23:55 -04:00
Luca Della Vedova 079b7deb33 Merge branch 'master' of https://github.com/assimp/assimp into fix/collada_parser_sid 2022-06-13 10:20:46 +08:00
hgdagon ce8081bd0a
Merge branch 'master' into master 2022-06-13 00:15:31 +04:00
Kim Kulling b8812d2b4f
Merge pull request #4552 from assimp/kimkulling/create_skeleton_data_issue_4015
[Experimental] New skeleton container for bones
2022-06-11 21:57:41 +02:00
Kim Kulling 5adea2dbcf
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015 2022-06-11 21:40:44 +02:00
Kim Kulling aaa19903c6 Fix merge conflicts 2022-06-11 18:50:18 +02:00
naveen a5a38775f1 chore: Included githubactions in the dependabot config
This should help with keeping the GitHub actions updated on new releases. This will also help with keeping it secure.

Dependabot helps in keeping the supply chain secure https://docs.github.com/en/code-security/dependabot

GitHub actions up to date https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot

https://github.com/ossf/scorecard/blob/main/docs/checks.md#dependency-update-tool
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-06-10 01:30:07 +00:00
Kim Kulling 0768a13057
Merge pull request #4567 from assimp/kimkulling/fix_nullptr_exception_opnglb_export_issue4418
Fix  possible nullptr exception
2022-06-08 08:13:16 +02:00
Kim Kulling 02b0c89fa4
Fix usage of validation 2022-06-08 00:10:13 +02:00
Kim Kulling 4fb5cf4ba6
Fix possible nullptr exception
- closes https://github.com/assimp/assimp/issues/4418
2022-06-07 23:33:56 +02:00
Kim Kulling 34cb936844
Merge pull request #4546 from matthewclendening/fix_FBXConverter_double_precision
Fixed FBXConverter build error when using double precision
2022-06-07 22:30:33 +02:00
Kim Kulling b9fdf6d3ca
Merge branch 'master' into fix_FBXConverter_double_precision 2022-06-07 22:08:56 +02:00
Kim Kulling bc2786d830
Merge pull request #4564 from ethaninfinity/master
Pragma warnings cause build fail with MinGW
2022-06-07 22:08:03 +02:00
Kim Kulling e7daa5759b
Merge branch 'master' into master 2022-06-07 22:01:00 +02:00
Kim Kulling 7a64f751ab
Merge branch 'master' into master 2022-06-07 21:29:33 +02:00
Kim Kulling 988b5c1f36
Merge pull request #4565 from assimp/kimkulling-create-security-vulnerability
Create SECURITY.md
2022-06-07 21:10:44 +02:00
Kim Kulling 096aee2c25
Create SECURITY.md
- Prepare a first contact point for security vulnerability
2022-06-07 20:58:45 +02:00
ethaninfinity d018c3b555 Added back pragma warnings and changed to be MSVC-specific 2022-06-07 11:42:09 -04:00
ethaninfinity c5b6b26b8b Revert "Removed pragma warnings"
This reverts commit 4961241c09.
2022-06-07 11:27:12 -04:00
ethaninfinity 4961241c09 Removed pragma warnings 2022-06-06 14:53:03 -04:00
Matthew Clendening aca02190a7
Merge branch 'master' into fix_FBXConverter_double_precision 2022-06-06 10:01:13 -04:00
Kim Kulling 49fdd12fdf
Merge pull request #4554 from Nor-s/fix_fbx
Fix Import a specific FBX model will freeze the app #4395
2022-06-03 13:48:35 +02:00
Kim Kulling 680ea6b0e0
Merge branch 'master' into fix_fbx 2022-06-03 11:21:41 +02:00
Kim Kulling 39a4627519
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015 2022-06-02 21:47:29 +02:00
Kim Kulling 530ae2b192
Merge pull request #4555 from Underdisc/issue4516
Remove dllexport tags from static library builds.
2022-06-02 20:01:51 +02:00
Kim Kulling 638fda66da
Merge branch 'master' into issue4516 2022-06-01 20:47:13 +02:00
nsg 96d2052ed0
Merge branch 'master' into fix_fbx 2022-06-02 02:31:32 +09:00
Kim Kulling 7fcd961a20
Merge pull request #4549 from Gargaj/msvcfix
fix msvc warnings-as-errors
2022-06-01 17:39:01 +02:00
Kim Kulling 03532eaec3
Merge branch 'master' into msvcfix 2022-06-01 17:11:06 +02:00
Underdisc 17289985a4 Update comment 2022-06-01 12:45:40 +02:00
Underdisc 02e0d1d05c Remove dllexport tags from static library builds. 2022-06-01 12:26:04 +02:00