Commit Graph

3194 Commits (c571b92dd7b770e3bdbe7a219f682be255c5f308)

Author SHA1 Message Date
Richard 5ae1c28881 Refactor: Apply editor config rules to tools 2015-06-29 20:54:59 -06:00
Kim Kulling 83defdddc4 Merge branch 'master' of https://github.com/assimp/assimp 2015-06-30 00:21:11 +02:00
Kim Kulling 011e1e9e16 Regression suite: fix return value. 2015-06-30 00:20:20 +02:00
Kim Kulling 72bbbcac52 Regression suite: returns != 0 in case of failures. 2015-06-30 00:17:49 +02:00
Kim Kulling f3d418a199 Merge pull request #566 from LegalizeAdulthood/editor-config
Editor config
2015-06-29 09:56:19 +02:00
Richard eee32a5668 Refactor: Expand tags to 4 spaces 2015-06-28 16:12:51 -06:00
Richard 4ec76d88f0 Refactor: Use LF for line endings 2015-06-28 16:11:05 -06:00
Richard e4b0c27a2e Refactor: Strip trailing whitespace 2015-06-28 16:09:18 -06:00
Richard 6ae07f8da5 Refactor: Expand tabs to 4 spaces 2015-06-28 16:08:06 -06:00
Richard 4b0f9f3e89 Refactor: Use LF for end of line 2015-06-28 16:08:06 -06:00
Richard 0af1f0d32f Refactor: Apply editor config settings to CMake files and generated sources 2015-06-28 16:08:06 -06:00
Richard b5f81fbab0 Implemented: Add editor config for test code 2015-06-28 16:08:06 -06:00
Richard e89c811bd1 Refactor: Apply C++ conventions to revision.h.in 2015-06-28 16:08:06 -06:00
Richard 54a2d0808c Refactor: Expand tabs to 4 spaces 2015-06-28 16:08:06 -06:00
Richard 6da45599c0 Refactor: Strip trailing whitespace 2015-06-28 16:08:06 -06:00
Richard 5dbd676c01 Refactor: Use LF line endings 2015-06-28 16:08:06 -06:00
Richard 9d736cc1c5 Implemented: Add editor config file 2015-06-28 16:04:15 -06:00
Richard 83de707587 Refactor: Expand tabs to 4 spaces 2015-06-28 16:04:15 -06:00
Richard a96a595a7a Refactor: Trim trailing whitespace 2015-06-28 16:01:32 -06:00
Richard 4c1a0507fe Refactor: Line endings are LF, not CRLF 2015-06-28 15:59:33 -06:00
Richard 8326535445 Implemented: Add editor config for source code 2015-06-28 15:50:57 -06:00
Richard 1d96486437 Refactored: Reformat CMake files to conform to editor config 2015-06-28 15:50:57 -06:00
Richard cec5653c1e Implemented: Add root .editorconfig and settings for CMake files 2015-06-28 15:50:57 -06:00
Richard 09b288197b Implemented: Ignore CLion .idea directory 2015-06-28 15:50:57 -06:00
Kim Kulling 2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
Kim Kulling 052b2a6f6e Merge branch 'master' of https://github.com/assimp/assimp 2015-06-28 21:06:59 +02:00
Kim Kulling db3aea4b18 Remove finding from code analysis. 2015-06-28 21:06:20 +02:00
Kim Kulling 5d48928653 Update LICENSE
LIcense info: fix copyright year range.
2015-06-26 09:50:49 +02:00
Kim Kulling 365417ccc5 Update Readme.md
Static code analysis: add coverity status report.
2015-06-26 09:50:19 +02:00
Kim Kulling 6249a1c06f CMake: add comment for openddl-parser configuration. 2015-06-23 21:28:13 +02:00
Kim Kulling 85e2f47dc8 Merge pull request #523 from turol/afl-fixes
More crash fixes
2015-06-22 16:56:51 +02:00
Kim Kulling 71cc64238a Merge pull request #588 from zippers/master
Added mesh name importing to .X ascii format.
2015-06-21 11:45:43 +02:00
Henry Stratmann III 328cae8a81 Added mesh name importing to .X ascii format. 2015-06-20 17:35:30 -05:00
Kim Kulling daabf4bf86 Merge pull request #585 from pampersrocker/fbxLoadingFix
Fixes random crash when loading fbx files
2015-06-20 12:03:42 +02:00
Marvin Pohl ff145bfac5 Removed unused variable 2015-06-19 14:24:34 +01:00
Marvin Pohl 927c9cb3ce Fixes random crash when loading fbx files 2015-06-19 14:04:30 +01:00
Wil Shipley eef960c6b2 - iOS target 9.0 2015-06-14 18:09:03 -07:00
Wil Shipley b581ae9c3d - Opened in latest Xcode. 2015-06-12 16:12:36 -07:00
Kim Kulling 63ef641ae8 Merge pull request #581 from rob100/code_quality
Several minor improvements based on cppcheck
2015-06-05 10:19:25 +02:00
rob100 b8c12fdc6f CodeQuality improvements
Several small code improvements based on a cppcheck result
2015-06-05 09:52:06 +02:00
Alexander Gessler 36a9f2be1a Merge pull request #577 from g-pechorin/patch-4
not-git (and "nested" builds)
2015-06-04 23:46:05 +02:00
Léo Terziman 81be291ae0 Merge remote-tracking branch 'official/master' into contrib 2015-06-02 17:39:06 +02:00
Alexander Gessler d51cd92445 Merge pull request #562 from asmaloney/feature/coding_convention
Coding Convention
2015-05-31 23:18:50 +02:00
Alexander Gessler 1a2f4ed105 Merge pull request #575 from g-pechorin/patch-3
ASSBIN comments seem incorrect
2015-05-31 23:18:17 +02:00
Kim Kulling 9c26f229a3 - OpenDDL-Parser: latest greatest.
- Add support of OpenGEX-texture types.
2015-05-31 20:36:55 +02:00
Peter LaValle 72b87ec526 removed x64 warnings 2015-05-31 13:35:10 +01:00
Peter LaValle 69b9bfec51 skips tests on systems without git 2015-05-31 13:14:16 +01:00
Peter LaValle 99e45b995b fixed warning 2015-05-31 12:56:17 +01:00
Peter LaValle a00101cc02 changes to allow embedding
changes several usages of CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR which allow embedding the assimp build in a larger CMake project

... as an alternative to dependency-hell
2015-05-31 11:57:33 +01:00
Peter LaValle db8b973aec wrapped the CRT warning macro
I already have these in an outer-script
2015-05-31 11:52:04 +01:00