Kim Kulling
|
566aa1ae00
|
Merge branch 'master' of https://github.com/assimp/assimp
|
2016-11-21 23:55:14 +01:00 |
|
Kim Kulling
|
c61146f52e
|
Add unittest fixure for aiMetadata.
|
2016-11-21 23:54:39 +01:00 |
|
Kim Kulling
|
0bce2d9a9c
|
Appveyor: fix another merge error.
|
2016-11-21 20:57:15 +01:00 |
|
Kim Kulling
|
c5d7a97b93
|
Travis config: fix last merge issues + merge coverity check into master branch to avoid merge issues in the future on master.
|
2016-11-21 20:42:37 +01:00 |
|
Kim Kulling
|
68b8948758
|
Disable android build.
|
2016-11-21 20:31:35 +01:00 |
|
Kim Kulling
|
eb462abf60
|
Fix another merge issue.
|
2016-11-21 20:21:26 +01:00 |
|
Kim Kulling
|
4880cd4a8c
|
Merge branch 'coverity_scan' of https://github.com/assimp/assimp into coverity_scan
|
2016-11-21 19:09:22 +01:00 |
|
Kim Kulling
|
e50ac81b65
|
Merge branch 'master' into coverity_scan
|
2016-11-21 18:57:56 +01:00 |
|
Kim Kulling
|
8a9deeb4a0
|
Fix coverity scan.
|
2016-11-21 18:55:57 +01:00 |
|
Kim Kulling
|
9e07701f3e
|
Merge branch 'master' into coverity_scan
|
2016-11-21 10:18:17 +01:00 |
Kim Kulling
|
eb6390a639
|
Merge pull request #1071 from jaredmulconry/master
AMF Postprocessed Metadata given type bool regardless of original type
|
2016-11-20 17:52:47 +01:00 |
|
Kim Kulling
|
86dd83cced
|
Merge pull request #1073 from elect86/patch-2
Update STLLoader.cpp
|
2016-11-20 17:51:16 +01:00 |
Giuseppe Barbieri
|
b6fb1f3c05
|
Update STLLoader.cpp
If `faceVertexCounter` does not start equal 3, then at line 291 you will get a warning
|
2016-11-20 15:14:33 +01:00 |
|
Kim Kulling
|
7ceaca61fd
|
Set right source encoding for coveralls-lcov.
|
2016-11-19 15:23:08 +01:00 |
|
Kim Kulling
|
d0d07006c8
|
Travis config: fix typo.
|
2016-11-19 11:54:39 +01:00 |
|
Kim Kulling
|
dc3875b8f2
|
Travis: fix typo.
|
2016-11-19 11:48:39 +01:00 |
Jared Mulconry
|
e4d43aa51a
|
Fixed a bug in the AMF Importer Postprocessing where metadata would be
incorrectly recorded as having type bool for all entries.
|
2016-11-19 02:07:32 +11:00 |
|
Kim Kulling
|
235010d531
|
Merge pull request #1070 from elect86/patch-1
Update material.h
|
2016-11-18 14:56:22 +01:00 |
|
Giuseppe Barbieri
|
91e4d029dc
|
Update material.h
Fixed grammar
|
2016-11-18 13:08:00 +01:00 |
|
Kim Kulling
|
cae8a172c3
|
Merge branch 'master' into coverity_scan
|
2016-11-18 11:38:45 +01:00 |
|
Kim Kulling
|
a9c5b6f1be
|
Ensure that filelist for assimp lib is not empty for coveralls.
|
2016-11-17 19:57:24 +01:00 |
|
Kim Kulling
|
46a022520f
|
Remove commented code.
|
2016-11-17 19:11:28 +01:00 |
|
Kim Kulling
|
0f2ed2c449
|
Remove unused filter for coveralls.
|
2016-11-17 15:11:05 +01:00 |
|
Kim Kulling
|
01135855e0
|
Remove folder test from test coverage.
|
2016-11-17 14:35:21 +01:00 |
|
Kim Kulling
|
b990e93b9f
|
Merge pull request #1067 from assimp/coverall_support
Travis: enable coverall support.
|
2016-11-17 11:40:35 +01:00 |
|
Kim Kulling
|
9b63015626
|
Disable debou output for lcov call in travis config.
|
2016-11-17 11:17:53 +01:00 |
|
Kim Kulling
|
7a7f7b851b
|
Remove deprecated boost workaround flag from travis config.
|
2016-11-17 11:16:42 +01:00 |
|
Kim Kulling
|
2fdc6a51d2
|
Embed coverage to readme.
|
2016-11-17 10:57:53 +01:00 |
|
Kim Kulling
|
6daa464378
|
Next try: use original directory root.
|
2016-11-17 10:23:57 +01:00 |
|
Kim Kulling
|
8b1f382a0e
|
Travis config: use correct env variable to enable coveralls.
|
2016-11-17 10:06:50 +01:00 |
|
Kim Kulling
|
8bd9fadeea
|
Check assimp.dir folder.
|
2016-11-16 21:43:22 +01:00 |
|
Kim Kulling
|
c695c74a60
|
Much more verbose.
|
2016-11-16 21:35:10 +01:00 |
|
Kim Kulling
|
8d4633510f
|
More verbose.
|
2016-11-16 21:28:20 +01:00 |
|
Kim Kulling
|
1dd8148e81
|
Make travis more verbose.
|
2016-11-16 21:16:50 +01:00 |
|
Kim Kulling
|
4d47e47815
|
Fix typo.
|
2016-11-16 20:14:54 +01:00 |
|
Kim Kulling
|
c399981dbe
|
Next try.
|
2016-11-16 20:08:04 +01:00 |
|
Kim Kulling
|
7307c07623
|
Add missing cmake mocules
|
2016-11-16 16:46:54 +01:00 |
|
Kim Kulling
|
284b755cf9
|
add test source to coveralls again.
|
2016-11-16 16:36:22 +01:00 |
|
Kim Kulling
|
4ac3a0af8f
|
iEnable coverall for tests.
|
2016-11-16 16:19:43 +01:00 |
|
Kim Kulling
|
6c5e475d14
|
Still working on config.
|
2016-11-16 16:11:30 +01:00 |
|
Kim Kulling
|
09df4b0299
|
Fix travis cmake call to enable coberalls.
|
2016-11-16 15:54:53 +01:00 |
|
Kim Kulling
|
e95ccee97e
|
Test coverage only in one comp from build matrix.
|
2016-11-16 15:42:08 +01:00 |
|
Kim Kulling
|
53d6adeb53
|
Enable coveralls measurement
|
2016-11-16 12:24:55 +01:00 |
|
Kim Kulling
|
76794f4aa7
|
Enableing test coverage for unittests.
|
2016-11-16 12:06:21 +01:00 |
|
Kim Kulling
|
a6c86c79f1
|
Travis: enable coverall support.
|
2016-11-16 11:39:44 +01:00 |
|
Kim Kulling
|
a1f773c305
|
Merge branch 'master' of https://github.com/assimp/assimp
|
2016-11-14 20:34:52 +01:00 |
|
Kim Kulling
|
855031d37c
|
CmakeLists: remove ugly and deprecated hack fo mingw.
|
2016-11-14 20:20:03 +01:00 |
|
Kim Kulling
|
302b8044c6
|
Merge pull request #1064 from snowzurfer/master
Fix obj .mtl file loading
|
2016-11-14 20:17:28 +01:00 |
|
Kim Kulling
|
afad31acab
|
Merge pull request #1066 from jaredmulconry/master
MSVC14 x64 /bigobj missing causes compile error
|
2016-11-14 19:02:52 +01:00 |
|
Jared Mulconry
|
eceb61b854
|
Fixed a compile error on MSVC14 x64 caused by the /bigobj flag failing to be set
for the 1 and 2-suffixed versions introduced in
commit 0a25b076b8.
|
2016-11-14 22:52:29 +11:00 |