Commit Graph

  • e568c2df9d ColladaParser::ReadIndexData: don't rely on the specified number of primitives. Johannes Ebersold 2014-11-19 14:38:03 +0100
  • 72f67ea0cd Whitespace changes Johannes Ebersold 2014-11-19 14:32:01 +0100
  • 593484829b Add Function ColladaParser::ReadPrimTriStrips. Johannes Ebersold 2014-11-19 14:30:18 +0100
  • 0f40dcca7e Add calculation for nuber of Primitives for TriStrips Johannes Ebersold 2014-11-19 14:26:54 +0100
  • 7c4bf383d7 Move vertex copy operation into switch statement. Johannes Ebersold 2014-11-19 14:16:10 +0100
  • 4ef244f672 Extract function ColladaParser::CopyPrimitive Johannes Ebersold 2014-11-19 14:10:16 +0100
  • 70d2c8571b ColladaParser::ReadPrimitives: get rid of "idx" iterator. Johannes Ebersold 2014-11-19 14:04:49 +0100
  • 543bd5c0d0 ColladaParser::ReadPrimitives: rename "a" to currentPrimitive Johannes Ebersold 2014-11-19 13:51:22 +0100
  • 7be4badd76 Merge pull request #413 from jdduke/fix_ns_obj_material Kim Kulling 2014-11-19 10:23:20 +0100
  • c7b6b5ea2f Support lowercase 'ns' and 'ni' obj material tokens Jared Duke 2014-11-18 16:56:46 -0800
  • dbf9536213 bugfix: add correct handling for metric line end for example file. Kim Kulling 2014-11-02 20:30:45 +0100
  • 1a5695ff48 update: add parsing of metric nodes. Kim Kulling 2014-11-02 19:01:04 +0100
  • 4932d8a74f Merge pull request #11 from AIM360/KB/remove_unused_members Christine 2014-10-29 13:10:33 +0100
  • 0e1e6faafc removed unused private member variables Kosta 2014-10-29 12:37:15 +0100
  • 6843c42da1 update: - merge master into branch - fix metrix header parsing. Kim Kulling 2014-10-28 21:45:09 +0100
  • f84589fec4 Merge branch 'master' into opengex_support Kim Kulling 2014-10-24 15:24:32 +0200
  • 94f61300c2 bugfix: - remove and comment some gcc compiler warnings for not used vaiables. Kim Kulling 2014-10-23 21:02:43 +0200
  • cee583db06 bugfix: fix compiler warning: converting double to float. Kim Kulling 2014-10-22 23:05:25 +0200
  • 43dbd6d873 update: add some files to .gitignore. Kim Kulling 2014-10-22 21:37:25 +0200
  • 2d7ce22569 Merge pull request #405 from TimothyGu/patch-1 Alexander Gessler 2014-10-15 00:52:55 -0700
  • 8656a35134 assimp.pc.in: Add static libs to Libs.private Timothy Gu 2014-10-14 22:29:08 -0700
  • 060f3c33d9 CMakeList: Support setting Libs.private Timothy Gu 2014-10-14 22:28:14 -0700
  • 940414104a Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-10-13 14:10:11 +0200
  • b483be3069 Merge pull request #402 from jdduke/disable_bmesh Alexander Gessler 2014-10-10 22:46:25 -0700
  • a1a1bf77a8 Temporarily disable Blender BMesh conversion Jared Duke 2014-10-10 14:16:42 -0700
  • 487c9449d2 bugfix: search for token checks for the given tokenlist against the lowercased info coming from the asset file. So we also have to used a lowercased token. Thanks to Robinson for the report. Kim Kulling 2014-10-10 15:59:42 +0200
  • dad152e726 Merge pull request #399 from filipwasil/Android_JNI_Asset_extraction_support Kim Kulling 2014-10-08 13:17:23 +0200
  • 88f6e8213b Android JNI asset extraction support (API 9+) Filip Wasil 2014-10-07 17:05:14 +0200
  • 7224476ee1 Android JNI asset extraction support (API 9+) Filip Wasil 2014-10-07 16:23:56 +0200
  • 24b9243da0 Android JNI asset extraction support (API 9+) Filip Wasil 2014-10-06 14:11:13 +0200
  • c967cf7af5 Merge pull request #396 from OgreTransporter/master Alexander Gessler 2014-09-27 20:06:22 -0700
  • 9b3a88b2a5 New boost versions OgreTransporter 2014-09-27 21:04:57 +0200
  • c2d13fbd76 Merge pull request #395 from Gargaj/patch-1 Kim Kulling 2014-09-26 19:30:47 +0200
  • 397989e169 Null-terminate string Gargaj 2014-09-26 01:29:23 +0200
  • 2014932593 Merge remote-tracking branch 'upstream/master' Robin Schlegel 2014-09-24 14:47:10 +0200
  • a5afbcf29c refactoring: remove duplicate code. Kim Kulling 2014-09-23 23:34:05 +0200
  • d228dbeab7 Merge pull request #394 from abma/master Alexander Gessler 2014-09-22 16:12:36 -0700
  • 775b26e614 use std:: namespace for most cmath functions: abma 2014-09-23 00:42:32 +0200
  • b359deb7fd update: - add assert test in obj-import - fix material token in Obj. Kim Kulling 2014-09-21 20:37:36 +0200
  • e6eeab8c84 Merge pull request #388 from jdduke/rebase_blend_regression_db Alexander Gessler 2014-09-20 23:27:18 -0700
  • f44968669f Merge pull request #391 from jdduke/fix_blend_bmesh_uvloop Alexander Gessler 2014-09-20 23:26:35 -0700
  • 4dcd316430 Use strict inequality when validating BMesh uvloop access Jared Duke 2014-09-20 10:23:21 -0700
  • 5e114c04d2 Use Linux/GCC build for DB generation Jared Duke 2014-09-17 08:49:28 -0700
  • 083d5630ef Use VC11 build for DB generation Jared Duke 2014-09-17 07:30:55 -0700
  • c8661ab055 Rebase BLEND regression db entries Jared Duke 2014-09-16 17:47:55 -0700
  • 6a8f69ad5d Merge pull request #386 from jdduke/rebase_fbx_fov Alexander Gessler 2014-09-16 09:37:37 -0700
  • 1add165319 Merge pull request #1 from assimp/master Denis 2014-09-16 12:30:43 +0400
  • aac40dd5b8 Merge pull request #385 from jdduke/fix_blend_and_rebase_regression_tests Alexander Gessler 2014-09-16 01:10:53 -0700
  • f7f906ec70 Merge pull request #387 from Kvalme/master Alexander Gessler 2014-09-16 01:09:55 -0700
  • 046b7e5f47 Rebase FBX regression db entries Jared Duke 2014-09-15 18:14:38 -0700
  • c482458cae Fix non-BMesh containing .blend import Jared Duke 2014-09-14 17:19:42 -0700
  • ab6b5a7b21 Fix gcc warnings. (initialization order) Denis Biryukov 2014-09-15 23:35:03 +0400
  • d5dad7242c Merge 6cb6284756 into f2d26222fc Jared Duke 2014-09-15 00:24:55 +0000
  • 6cb6284756 Fix .blend import and rebase regression database Jared Duke 2014-09-14 17:19:42 -0700
  • f2d26222fc Merge pull request #383 from jdduke/blender_fix_uv_conversion Alexander Gessler 2014-09-13 14:47:51 -0700
  • 35c9a33718 Fix crash for Blender poly to face conversion without UVs Jared Duke 2014-09-13 09:34:07 -0700
  • 875e65a86a Merge pull request #381 from jdduke/fix_bsp_null_check Alexander Gessler 2014-09-12 23:08:56 -0700
  • 485aa8b39d Fix null check in Q3BSPFileImporter Jared Duke 2014-09-12 19:37:10 -0700
  • db582ee024 bugfix: replace nullptr with NULL: Kim Kulling 2014-09-12 18:12:18 +0200
  • 208d8975f6 Merge f0714a27f0 into 49c9786b0a Filip Wasil 2014-09-12 14:13:05 +0000
  • 49c9786b0a update: avoid mesh generation on heap, when the mesh will be empty ( obj-loader ). Kim Kulling 2014-09-12 15:40:50 +0200
  • 7dff0c6d52 refactoring: remove not use iosystem. Kim Kulling 2014-09-12 12:05:42 +0200
  • 75d3c8e9f2 update: metric parsing ongoing. Kim Kulling 2014-09-12 12:00:03 +0200
  • 2aba4a8d1d Merge pull request #378 from MGinshe/patch-1 Kim Kulling 2014-09-11 18:30:25 +0200
  • f0714a27f0 Android JNI asset extraction support (API 9+) Filip Wasil 2014-09-10 12:00:58 +0200
  • af4c30bc77 small typo fix Ryan Cole 2014-09-12 01:48:41 +1200
  • 0008f845b0 Merge pull request #376 from jdduke/make_fast_atof_test_cpp03 Jared Duke 2014-09-09 16:46:58 -0700
  • 43c82b0b38 Remove std::isnan and std::isinf usage from utFastAtofTest Jared Duke 2014-09-09 16:34:10 -0700
  • e0ea8169e3 Merge pull request #374 from jdduke/test_atof Kim Kulling 2014-09-09 10:04:41 +0200
  • 0e28416104 Add tests for fast_atof Jared Duke 2014-09-08 17:30:21 -0700
  • de873dec39 MinGW compile fix (time include missing) U-a2920\zsolt 2014-09-08 15:53:28 +0200
  • 459c060f0e update for gitignore, pyc and MSVC directories U-a2920\zsolt 2014-09-08 13:05:14 +0200
  • 3c86fc3de1 travis is our firend? U-a2920\zsolt 2014-09-08 09:58:43 +0200
  • 302aec6be4 Merge pull request #372 from jdduke/gtest_pr_final Kim Kulling 2014-09-08 08:50:07 +0200
  • 66e608a393 Replace cppunit with the googletest framework Jared Duke 2014-09-07 16:52:03 -0700
  • 6943016564 needs correct dir in a variable for window0 U-a2920\zsolt 2014-09-07 22:47:07 +0200
  • 491eb1d3ab typo Ser Lev Arris 2014-09-07 22:32:38 +0200
  • f2971ef3e6 use findpythoninterpreter U-a2920\zsolt 2014-09-07 21:46:46 +0200
  • 0df619267b Merge a0030735f8 into a51a0b36f0 Jared Duke 2014-09-07 17:53:18 +0000
  • a0030735f8 Merge branch 'master' into gtest_final Jared Duke 2014-09-07 10:51:14 -0700
  • d780e2eabd Replace cppunit with the googletest framework Jared Duke 2014-09-07 10:40:07 -0700
  • 2a410985d3 disabled minizip lookup for windows testing U-a2920\zsolt 2014-09-07 17:42:00 +0200
  • 3ce9d70adb cmd.exe don't likes /'s Ser Lev Arris 2014-09-07 17:08:24 +0200
  • b65ca3cc82 normally in gitignored dir... Ser Lev Arris 2014-09-07 16:13:33 +0200
  • b7631877f0 cppunit fix, compiles on linux (make test, make unit -> all OK). no need to install cppunit for build host Ser Lev Arris 2014-09-07 15:57:15 +0200
  • 0c44f8800b fix on dependency (test unit & regression) Ser Lev Arris 2014-09-06 21:39:23 +0200
  • cf73143822 just build unit if requested e.g. make test Ser Lev Arris 2014-09-06 21:22:08 +0200
  • f44f8149d8 Merge pull request #1 from assimp/master Michael Dawson-Haggerty 2014-09-06 14:47:48 -0400
  • 6777b75c9e Merge branch 'master' of https://github.com/arris69/assimp into cmake-make-test-support Ser Lev Arris 2014-09-06 17:12:33 +0200
  • e54369d4eb make test stuff, initial just an idea Ser Lev Arris 2014-09-06 17:00:30 +0200
  • b6cacb2764 Merge remote-tracking branch 'upstream/master' Ser Lev Arris 2014-09-06 16:18:57 +0200
  • 3568028bd1 makes travis happy? Ser Lev Arris 2014-09-06 10:55:28 +0200
  • a8f7c15b9f Merge a8deb121e4 into a51a0b36f0 Jared Duke 2014-09-06 07:35:01 +0000
  • a51a0b36f0 Merge pull request #361 from assimp/travis Alexander Gessler 2014-09-06 00:35:00 -0700
  • c3b35f3933 update: add endline. Kim Kulling 2014-09-06 09:19:28 +0200
  • 460566197b Travis: fix echo failing Alexander Gessler 2014-09-06 00:14:50 -0700
  • 1249171bba Regression tests: output list of failures in Travis terminal output Alexander Gessler 2014-09-05 23:56:49 -0700
  • 72eb2e0c4e Merge branch 'travis' of github.com:assimp/assimp into travis acgessler 2014-09-05 21:20:35 -0700
  • 5a0c7058b5 regression tests: ignore pond.0.ply file due to overly long runtime. acgessler 2014-09-05 21:20:07 -0700
  • a8deb121e4 Rebase to master Jared Duke 2014-09-05 20:42:45 -0700