85e2f47dc8
Merge pull request #523 from turol/afl-fixes
...
More crash fixes
2015-06-22 16:56:51 +02:00
71cc64238a
Merge pull request #588 from zippers/master
...
Added mesh name importing to .X ascii format.
2015-06-21 11:45:43 +02:00
328cae8a81
Added mesh name importing to .X ascii format.
2015-06-20 17:35:30 -05:00
daabf4bf86
Merge pull request #585 from pampersrocker/fbxLoadingFix
...
Fixes random crash when loading fbx files
2015-06-20 12:03:42 +02:00
ff145bfac5
Removed unused variable
2015-06-19 14:24:34 +01:00
927c9cb3ce
Fixes random crash when loading fbx files
2015-06-19 14:04:30 +01:00
eef960c6b2
- iOS target 9.0
2015-06-14 18:09:03 -07:00
b581ae9c3d
- Opened in latest Xcode.
2015-06-12 16:12:36 -07:00
63ef641ae8
Merge pull request #581 from rob100/code_quality
...
Several minor improvements based on cppcheck
2015-06-05 10:19:25 +02:00
b8c12fdc6f
CodeQuality improvements
...
Several small code improvements based on a cppcheck result
2015-06-05 09:52:06 +02:00
36a9f2be1a
Merge pull request #577 from g-pechorin/patch-4
...
not-git (and "nested" builds)
2015-06-04 23:46:05 +02:00
81be291ae0
Merge remote-tracking branch 'official/master' into contrib
2015-06-02 17:39:06 +02:00
d51cd92445
Merge pull request #562 from asmaloney/feature/coding_convention
...
Coding Convention
2015-05-31 23:18:50 +02:00
1a2f4ed105
Merge pull request #575 from g-pechorin/patch-3
...
ASSBIN comments seem incorrect
2015-05-31 23:18:17 +02:00
9c26f229a3
- OpenDDL-Parser: latest greatest.
...
- Add support of OpenGEX-texture types.
2015-05-31 20:36:55 +02:00
72b87ec526
removed x64 warnings
2015-05-31 13:35:10 +01:00
69b9bfec51
skips tests on systems without git
2015-05-31 13:14:16 +01:00
99e45b995b
fixed warning
2015-05-31 12:56:17 +01:00
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
db8b973aec
wrapped the CRT warning macro
...
I already have these in an outer-script
2015-05-31 11:52:04 +01:00
6ddb67b321
corrected misinformation in the documentation
...
> corrected note saying that the header was 500 bytes long (512 bytes are written and the number 512 is given elsewhere)
> altered confusing language about how long the chunks are ("length of chunk" implies the number includes the chunk-header. chunk-data-length less so, and reflects the fact that the number written doesn't include the chunk-header)
> removed mistake about how texture coordinates are encoded (the last release, and the current head both write texture coordinates as 3 float components regardless of what they actually are)
2015-05-30 23:40:17 +01:00
ab95b1a3c1
Replace tabs with whitespaces in CMake-file.
2015-05-30 18:13:08 +02:00
6cc32a946b
Fix transformation parsing for OpenGEX-parser.
2015-05-29 20:50:09 +02:00
670278da82
Merge branch 'master' of https://github.com/assimp/assimp
2015-05-29 20:46:10 +02:00
5e1fc39448
Add parsing of texture nodes of OpenGEX-format importer.
2015-05-29 20:45:31 +02:00
9a9a121b2d
Merge pull request #573 from jaimemachado/master
...
Creating the functionality to list all Importer descriptions and the …
2015-05-26 19:37:21 +02:00
de6f0f2a7d
Creating the functionality to list all Importer descriptions and the number of importers available.
2015-05-26 08:40:43 -03:00
4d05dd913c
Merge pull request #572 from asmaloney/fix/code_cleanup
...
Code Cleanups
2015-05-24 12:17:27 -07:00
4cbce374b6
Code Cleanups
...
- add initializers to classes
- fix %i/%u for unsigned ints
- remove unused vars
- pass by reference
2015-05-24 11:55:37 -04:00
8e24695f29
Merge pull request #571 from jdduke/fix_cmake
...
Fix issue with CMAKE_CXX_FLAGS initialization
2015-05-24 00:52:13 +02:00
ef306d5666
Fix issue with CMAKE_CXX_FLAGS initialization
...
Append the necessary flags to CMAKE_CXX_FLAGS, rather than replacing
the previous values. It's critical that that flags are preserved to
ensure proper and consistent compilation.
2015-05-23 13:46:35 -07:00
9538b7ed42
Merge pull request #570 from wise86-android/colladaExportLightAndCamera
...
Collada export light and camera
2015-05-23 12:06:23 +02:00
26b3328f3b
fix xml syntax + more deap test
2015-05-23 11:03:56 +02:00
7962897549
Change to what seems to be agreed upon (in line with PR #566 )
2015-05-21 09:00:34 -04:00
baddcc2f34
- use markdown for coding convention
...
- rewrite it
2015-05-21 08:56:47 -04:00
5ad6179bc5
export the light in the collada file
2015-05-19 23:15:18 +02:00
b1d085b6a9
fix the foruma for compute the mAngleOuterCone values
2015-05-19 23:08:31 +02:00
2c194f629a
fix macro for be uesed with expression
2015-05-19 21:57:51 +02:00
4c0171a0e9
Merge pull request #563 from asmaloney/fix/overlapping_merge
...
Fix overlapping merges
2015-05-18 23:09:24 +02:00
28cc934bb9
Fix overlapping merges
2015-05-18 09:51:09 -04:00
7cd8cc1b1f
Merge pull request #560 from asmaloney/fixes/init_cleanup
...
Fix inits and a couple of empty checks
2015-05-18 09:49:59 +02:00
4bdf23aece
Merge pull request #561 from LegalizeAdulthood/warnings
...
Fix compiler warnings
2015-05-18 09:48:01 +02:00
9cbef8cba3
Refactor: Initialize members in declaration order; prefer initialization over assignment
2015-05-17 20:50:58 -06:00
cac8707121
Refactor: Delete unused field
2015-05-17 20:48:04 -06:00
4a5e9352d6
Refactor: Delete unused functions
2015-05-17 20:46:56 -06:00
a34adb8450
Refactor: Delete unused functions
2015-05-17 20:45:16 -06:00
814ef32dce
Refactor: Delete unused fields
2015-05-17 20:43:25 -06:00
5bb09377cb
Refactor: Delete unused variable
2015-05-17 20:40:35 -06:00
7b3fa5ebc2
Refactor: Delete unused forward decls, delete unused function
2015-05-17 20:22:31 -06:00
79c916daf4
Refactor: Remove unused variable
2015-05-17 20:05:05 -06:00
Kim Kulling
Henry Stratmann III
Marvin Pohl
Wil Shipley
rob100
Alexander Gessler
Léo Terziman
Kim Kulling
Peter LaValle
Jaime Machado Neto
Andy Maloney
Jared Duke
wise86Android
Richard