Commit History

Author SHA1 Message Date
  Eric Engestrom 87e7cf00a2 Fix spelling mistakes 9 years ago
  Paul Holland f20a5afcf0 can't add integer to string pointer 9 years ago
  Trond Abusdal ccd9f92533 Fixed a couple of nested template brackets that wasn't spaced out correctly. 9 years ago
  Trond Abusdal 7e58a47ba0 * Combining single-channel animations like the previous code did, except now it has been deferred until after all nodes have been read. This makes the regression tests pass for a database created before these code changes. 9 years ago
  Trond Abusdal c34717639e Collada: Importer generates animations from <library_animation_clips>, if the node is present. 9 years ago
  Kim Kulling 1191d03405 Update license info. 9 years ago
  Alexander Gessler 5847576f41 Merge pull request #703 from terziman/master 9 years ago
  Joe Hermaszewski 210764a6ff Correct spelling 9 years ago
  Kim Kulling 35fafe3a6f ColladaParser: use initializer lists again. 9 years ago
  Kim Kulling b694bfd021 fix build 9 years ago
  Léo Terziman 6eebf8455a Merge remote-tracking branch 'official/master' into contrib 9 years ago
  Léo Terziman 445ae1fec3 In collada: implemented all missing transparency features from standard (ie RGB_ZERO, RGB_ONE and A_ZERO) 9 years ago
  Kim Kulling 0a6788d56f try to fix build. 9 years ago
  Kim Kulling 6641188a8e assimp/issues/702: fix resource leak and use initializer list for all 9 years ago
  Danke Xie 24b68b1e3d Support instance_image in Collada 1.5 files 9 years ago
  Gargaj 9885c3e551 add opencollada extension 10 years ago
  Wil Shipley 7a7a496320 - Add include of stdarg, because apparently that's needed to build of Github server with Travis. 10 years ago
  Wil Shipley 8b7fa48d27 - Merge in latest from assimp/assimp on GitHub (5c00aef7cd8ab6b7f86c8297958a630f9459dc53) 10 years ago
  Richard 83de707587 Refactor: Expand tabs to 4 spaces 10 years ago
  Richard a96a595a7a Refactor: Trim trailing whitespace 10 years ago
  Richard 4c1a0507fe Refactor: Line endings are LF, not CRLF 10 years ago
  Kim Kulling 2bfc353fde License info: update year info. 10 years ago
  Wil Shipley 91ca983d5f - Workaround for Collada exporter in SketchUp 15.3.331 (possibly others) where it'll export the wrong "count" when exporting "lines". 10 years ago
  Léo Terziman 91c751a03a Added missing header 10 years ago
  Léo Terziman 5b9af11f9b Merge remote-tracking branch 'official/master' into contrib 10 years ago
  abma 8c45a4dc3b Merge remote-tracking branch 'origin' 10 years ago
  abma bf4913b5c9 remove AssimpPCH.h: fixes #534 10 years ago
  Léo Terziman 60d58901a5 Merge remote-tracking branch 'official/master' into contrib 10 years ago
  Alexander Gessler 16880b3dbd Fix build after mis-merge. 10 years ago
  Alexander Gessler c59878e427 Merge branch 'master' of github.com:assimp/assimp 10 years ago