Commit Graph

25 Commits (df6d2576335777055ba749aec8fddc7894a4320d)

Author SHA1 Message Date
Kim Kulling 442b258360 update gitignore 2018-08-09 22:27:21 +02:00
Doron Adler 27b989fd36 Merge branch 'master' into ios-build-script
* master: (148 commits)
  Update Importer.cpp
  [-] Trace print removed.
  [F] Get return "like true" when error occured.
  [*] qt_assimp_viewer can be built with Qt4 or Qt5. [F] Working in doule precision.
  [F] List of importers can be empty.
  [F] More correct control by a mouse
  [F] React on mouse pressing ig view only.
  [F] One alignment for labels. [-] Unused checkbox.
  [+] QtCreator temporary file.
  [*] Refactoring of "draw axes" procedure. [-] Removed not working part of code for reloading textures. That do nothing, just show checkbox. As Yoda said: "Do. Or do not. There is no try."
  [-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
  glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified.
  Fix GenVertexNormals
  [F] Wrong type in equation.
  [F] Uninitialized variables.
  Fix #1587 : add validation to LWS unit test
  Fix #1970: stl with empty solid
  Add test for issue 1970: STL with empty solid
  Add mesh name to ValidateDataStructure log
  Read and write the KHR_materials_unlit glTF/2.0 extension.
  ...

# Conflicts:
#	CMakeLists.txt
#	port/iOS/build.sh
2018-05-28 16:27:00 +03:00
smalcom c23f999196 [+] QtCreator temporary file. 2018-05-24 12:34:18 +03:00
Kim Kulling 1c9406b2f5 add linetest files to gitignore. 2018-05-12 08:09:07 +02:00
Doron Adler 14a1b9980e Norod: Do not attempt to look for Qt5Widgets when building for iOS
Norod: Toolchain files get their SDKVER, DEVROOT and SDKROOT values from build.sh
Norod: Removed deprecated CMAKE_FORCE_
Norod: Build shared libs is now set-able from a flag, so to be more extendable later
Norod: .gitignore updated
2018-03-19 15:49:16 +02:00
Robert Spencer f149a2641b Add compiled python files to the ignore list 2018-01-06 15:17:56 +02:00
Doug Stephen 3964f5cf43 Update .gitignore 2017-10-03 14:11:23 -05:00
Angelo Scandaliato 57b9232075 deleted code/MakeFile and added to .gitignore 2016-10-08 15:23:59 -07:00
Angelo Scandaliato 0d26fd00b7 removed Makefiles and added them to .gitignore 2016-10-06 02:54:49 -07:00
Chris Russ c57b524a59 moving cmake configure_file to appropriate location 2016-07-16 18:47:59 +10:00
CharlyZhang 9f39eeb69c make the `workspaces/xcode6/Assimp.xcodeproj` work 2016-07-06 15:08:28 +08:00
Vertexwahn 270355f326 Improved Findassimp.cmake to support VS2013. Added deployment of VS2013 libs and dll files. 2015-12-11 10:33:47 +01:00
Vertexwahn c6d1fcca74 Added custom target that copies generated libs and bin files to lib32/lib64 and bin32/64 folder 2015-12-10 17:15:27 +01:00
Richard 09b288197b Implemented: Ignore CLion .idea directory 2015-06-28 15:50:57 -06:00
Kim Kulling 76dd9467b2 fix win32-build for assimp_viewer .
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-17 20:02:55 +02:00
Kim Kulling c78ed74e70 - update gitignore file.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 16:56:43 +01:00
Kim Kulling 2717d51f7e Merge remote-tracking branch 'origin/master' into opengex_support
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ParsingUtils.h
2015-03-17 14:26:39 +01:00
Kim Kulling 1ee4c06e4b add openddl-parser to contrib.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 11:07:48 +01:00
Turo Lamminen f167fe1d4a Ignore unix editor backup files 2015-01-28 18:36:23 +02:00
Kim Kulling 26ac1e2c72 update gitignore file.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-29 11:35:48 +01:00
Kim Kulling 43dbd6d873 update: add some files to .gitignore.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-22 21:37:25 +02:00
Jonne Nauha b651420d7f .gitignore: Add stuff to the ignore list if one happens to build in the root and not in /build. This is atm kind of mandatory if you want the regression tests to find your binary. 2014-05-21 05:47:35 +03:00
Léo Terziman 1bae2bd93f Updated .gitignore 2014-01-17 11:55:49 +01:00
Léo Terziman 203e896dbc Updated .gitignore 2014-01-17 11:40:34 +01:00
Dennis Schridde 8535ebd730 Add gitignore file 2013-05-14 10:48:37 +02:00