Kim Kulling
c530635c03
Merge pull request #3147 from malortie/add-tests-to-c-api-2
...
Added tests to C API missing functionalities in #3091
2020-04-15 22:34:54 +02:00
jess
0f32f59dc3
Add Open Collective
...
Hi, I'm making updates for Open Collective. Either you or another core contributor signed this repository up for Open Collective. This pull request adds financial contributors from your Open Collective https://opencollective.com/assimp ❤️
What it does:
- adds a badge to show the latest number of financial contributors
- adds a banner displaying contributors to the project on GitHub
- adds a banner displaying all individuals contributing financially on Open Collective
- adds a section displaying all organizations contributing financially on Open Collective, with their logo and a link to their website
P.S: As with any pull request, feel free to comment or suggest changes.
Thank you for your great contribution to the Open Source community. You are awesome! 🙌
And welcome to the Open Collective community! 😊
Come chat with us in the #opensource channel on https://slack.opencollective.com - great place to ask questions and share best practices with other Open Source sustainers!
2020-04-15 13:24:22 -07:00
Kim Kulling
5377d740e8
fix the build
2020-04-15 21:52:21 +02:00
Kim Kulling
7fb37403de
Merge branch 'master' into sample-simpletextureddirectx11-nullptr
2020-04-15 20:55:53 +02:00
Kim Kulling
d46ec3f9b9
fix init ordering of members
2020-04-15 20:41:38 +02:00
Kim Kulling
a0218c690b
Remove unused variable m
2020-04-15 20:06:22 +02:00
Kim Kulling
54dbb90929
Merge branch 'master' into add-tests-to-c-api-2
2020-04-15 17:17:39 +02:00
Kim Kulling
f7cab11a80
Merge pull request #3150 from assimp/kimkulling-fix-workflow
...
Use checkoutv2
2020-04-15 17:17:25 +02:00
Kim Kulling
c079bb21a4
Use checkoutv2
2020-04-15 16:29:55 +02:00
Timur Umayev
69f8d47941
glTF2 support targetNames
2020-04-15 09:39:46 +01:00
Kim Kulling
b2a547b817
Add doc
2020-04-14 19:07:41 +02:00
Marc-Antoine Lortie
e399a12f71
Small changes to C API unit tests.
...
- (1) Changed randomized math structure values to predefined values to prevent cases that could potentially lead to division by zero.
- (2) Removed unused variable(s) due to (1).
- (3) Renamed variable(s) for better clarity.
2020-04-13 14:13:54 -04:00
Marc-Antoine Lortie
ac16a857ff
Merge remote-tracking branch 'upstream/master' into add-tests-to-c-api-2
2020-04-13 09:08:45 -04:00
Peter Seiderer
74c8d09bd8
contrib/zlib: disable dynamic library building
...
Fixes compile failure for static only toolchains (and assimp
links against the static one).
2020-04-13 14:55:57 +02:00
György Straub
e4ceccb42d
Merge branch 'master' into master
2020-04-12 15:58:25 +01:00
Kim Kulling
91ff457c87
Merge branch 'master' into sample-simpletextureddirectx11-nullptr
2020-04-10 19:44:04 +02:00
Kim Kulling
9b694a8645
Merge pull request #2885 from assimp/kimkulling_dev
...
Testcoverage improvements.
2020-04-10 18:58:29 +02:00
Kim Kulling
13429485d9
Update CMakeLists.txt
...
remove not needed lib
2020-04-10 17:00:38 +02:00
Kim Kulling
d2499ac197
Update CMakeLists.txt
...
Linke irrXml static for apple
2020-04-10 12:52:54 +02:00
Kim Kulling
872001c1c9
Merge branch 'master' into sample-simpletextureddirectx11-nullptr
2020-04-10 12:29:51 +02:00
Kim Kulling
9b671c6eb4
Update CMakeLists.txt
...
Add explicit linking of irrxml.
2020-04-10 12:27:40 +02:00
Max Vollmer (Microsoft Havok)
a14b5fb06f
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-10 08:44:19 +01:00
Max Vollmer (Microsoft Havok)
485d7ab52e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-10 08:44:18 +01:00
Kim Kulling
79af2b1a5c
Merge branch 'master' into kimkulling_dev
2020-04-09 19:55:45 +02:00
Kim Kulling
3d95e75774
Merge pull request #3141 from malortie/sample-simpletexturedogl-nullptr
...
Replaced NULL with nullptr for pointers in sample SimpleTexturedOpenGL.
2020-04-08 22:13:50 +02:00
Kim Kulling
909a838ea8
Merge branch 'master' into sample-simpletexturedogl-nullptr
2020-04-08 20:53:25 +02:00
Kim Kulling
bb7212c46a
Merge pull request #3139 from malortie/assimp-viewer-nullptr
...
Replaced NULL with nullptr for pointers in Assimp viewer.
2020-04-08 20:52:43 +02:00
Kim Kulling
c6045438dc
Merge branch 'master' into assimp-viewer-nullptr
2020-04-08 20:17:37 +02:00
György Straub
faf6ee2607
Merge branch 'master' into master
2020-04-08 12:11:02 +01:00
Marc-Antoine Lortie
592e71dd7e
Replaced NULL with nullptr for pointers in sample SimpleTexturedOpenGL.
2020-04-07 16:43:36 -04:00
Kim Kulling
abb628bc58
Merge pull request #3125 from malortie/fix-sample-simpletexturedogl-w4-compile-warnings
...
Fixed /W4 compile warnings in sample SimpleTexturedOpenGL.
2020-04-07 20:43:04 +02:00
Kim Kulling
d0e14e4140
Merge branch 'master' into fix-sample-simpletexturedogl-w4-compile-warnings
2020-04-07 18:47:32 +02:00
Marc-Antoine Lortie
3510d85967
Replaced NULL with nullptr for pointers in Assimp viewer.
2020-04-07 10:56:22 -04:00
György Straub
755f3748f1
Merge branch 'master' into master
2020-04-07 11:46:14 +01:00
Kim Kulling
b59e6a2df4
Merge pull request #3129 from malortie/fix-assimp-viewer-w4-compile-warnings
...
Fixed /W4 compile warnings in Assimp viewer.
2020-04-07 11:25:28 +02:00
Kim Kulling
c79c6f5ae7
Merge branch 'master' into fix-assimp-viewer-w4-compile-warnings
2020-04-07 11:09:25 +02:00
Kim Kulling
0f3b196afc
Merge pull request #3126 from vmatare/master
...
use GNUInstallDirs where possible (master branch)
2020-04-07 11:08:55 +02:00
Kim Kulling
06f148defc
Merge branch 'master' into fix-assimp-viewer-w4-compile-warnings
2020-04-06 20:59:36 +02:00
Kim Kulling
09eba0f039
Merge branch 'master' into master
2020-04-06 20:42:41 +02:00
Kim Kulling
4eb129fa6d
Merge pull request #3137 from assimp/issue_2166
...
closes https://github.com/assimp/assimp/issues/2166 :
2020-04-06 20:42:08 +02:00
Kim Kulling
9a11d91cb8
code reformattings.
2020-04-06 13:33:03 +02:00
Kim Kulling
131aed73b0
closes https://github.com/assimp/assimp/issues/2166 : add missing setter for metadata.
2020-04-06 11:16:16 +02:00
György Straub
b7d73dfa69
Merge branch 'master' into master
2020-04-05 06:03:19 +01:00
Marc-Antoine Lortie
105b2bdeaf
Replaced NULL with nullptr for pointers in sample SimpleTexturedDirectx11.
2020-04-04 15:37:50 -04:00
Kim Kulling
132ecae6f4
Merge branch 'master' into kimkulling_dev
2020-04-04 18:28:50 +02:00
Kim Kulling
a73fd6c84c
Update MessageProc.cpp
...
I guess Turol meant this change.
2020-04-04 18:24:19 +02:00
Marc-Antoine Lortie
1b0a0675dc
Applied review requested changes - renamed _data to data.
2020-04-04 10:32:29 -04:00
Marc-Antoine Lortie
1cb564aa4b
Fixed /W4 compile warnings in Assimp viewer.
2020-04-03 14:36:44 -04:00
Marc-Antoine Lortie
732dc6a5d6
Merge branch 'master' into fix-sample-simpletexturedogl-w4-compile-warnings
2020-04-03 14:15:31 -04:00
Kim Kulling
085212e58a
Merge pull request #3127 from malortie/fix-sample-simpletextureddirectx11-w4-compile-warnings
...
Fixed /W4 compile warnings in sample SimpleTexturedDirectx11.
2020-04-03 18:56:34 +02:00