Kim Kulling
|
3929ea0644
|
Merge pull request #2254 from assimp/kimkulling-patch-3
Update XFileParser.cpp
|
2019-06-15 20:39:37 +02:00 |
Kim Kulling
|
ced080f9f3
|
X: fix out of bound access.
|
2019-06-15 19:17:15 +02:00 |
Kim Kulling
|
eb27fb753d
|
Merge branch 'master' into kimkulling-patch-3
|
2019-06-15 13:44:13 +02:00 |
Kim Kulling
|
2d3c3379e5
|
Merge pull request #2488 from rbsheth/rbsheth_hunterize_assimp
Use Hunter for pulling in dependencies
|
2019-06-15 10:14:22 +02:00 |
Rahul Sheth
|
6c33374491
|
update install interface location
|
2019-06-13 22:08:34 -07:00 |
Rahul Sheth
|
d00f4f4b3a
|
Build Hunter-compatible config file
|
2019-06-13 21:34:47 -07:00 |
Rahul Sheth
|
5cda81e84b
|
code fixes for Hunter-based build
|
2019-06-13 21:32:37 -07:00 |
Rahul Sheth
|
dab8041bcd
|
rewrite include paths for Hunter packages
|
2019-06-13 21:32:36 -07:00 |
Rahul Sheth
|
a4587e8609
|
Use hunter to download dependencies if HUNTER_ENABLED is ON
|
2019-06-13 21:31:24 -07:00 |
Rahul Sheth
|
1db3e1e11f
|
Allow CXX_STANDARD and other relevant compiler definitions to be set by Hunter user
|
2019-06-13 21:31:24 -07:00 |
Rahul Sheth
|
dd9511aaef
|
Add HunterGate URL/SHA1
|
2019-06-13 21:31:24 -07:00 |
Rahul Sheth
|
34fa64faf9
|
Add HunterGate
|
2019-06-13 21:31:24 -07:00 |
Kim Kulling
|
b381467fc3
|
Merge pull request #2508 from pkoller/patch-1
fixed MSVC toolset versions >140
|
2019-06-13 15:40:49 +02:00 |
Kim Kulling
|
ba29b8f1da
|
Merge branch 'master' into patch-1
|
2019-06-13 13:41:40 +02:00 |
Kim Kulling
|
43375eafb7
|
Merge pull request #2509 from pkoller/pkoller-patch-1
additional changes in cmake template to find correct toolset version
|
2019-06-13 13:41:03 +02:00 |
Kim Kulling
|
8ec3aaed7d
|
Merge branch 'master' into pkoller-patch-1
|
2019-06-13 09:04:53 +02:00 |
Kim Kulling
|
8d0567f727
|
Merge pull request #2510 from assimp/issue_2431
closes https://github.com/assimp/assimp/issues/2431: use irrXml direc…
|
2019-06-13 09:04:37 +02:00 |
Kim Kulling
|
c2097d9d0a
|
Merge branch 'master' into issue_2431
|
2019-06-12 23:18:44 +02:00 |
Kim Kulling
|
05de460ced
|
Merge pull request #2497 from assimp/kimkulling-patch-doc
Fix documentation for assimp.net
|
2019-06-12 23:18:29 +02:00 |
Kim Kulling
|
0021c93892
|
closes https://github.com/assimp/assimp/issues/2431: use irrXml directly for mingw compiler.
|
2019-06-12 22:12:38 +02:00 |
Kim Kulling
|
6ed753d80a
|
Merge branch 'master' into kimkulling-patch-doc
|
2019-06-12 21:58:24 +02:00 |
Kim Kulling
|
fc06de82c6
|
Update Readme.md
Add more detailed information about the source code structure
|
2019-06-12 20:44:02 +02:00 |
Kim Kulling
|
963c6f1977
|
Merge branch 'master' into pkoller-patch-1
|
2019-06-12 18:44:39 +02:00 |
Kim Kulling
|
a4907e54b1
|
Merge pull request #2506 from assimp/reorg
Reorg
|
2019-06-12 15:05:53 +02:00 |
Kim Kulling
|
66f693a6a4
|
Update IRRLoader.cpp
fix case-sensitive typo.
|
2019-06-12 10:25:11 +02:00 |
Kim Kulling
|
e914b9531b
|
Update IRRLoader.h
fix case-sensity typo.
|
2019-06-12 00:55:06 +02:00 |
Kim Kulling
|
4dcb3c9235
|
Update ImporterRegistry.cpp
fix case-sensiive folder bug.
|
2019-06-11 21:55:21 +02:00 |
Kim Kulling
|
fc065d8ab4
|
Merge branch 'master' into reorg
|
2019-06-11 20:59:46 +02:00 |
Kim Kulling
|
a6e3fc3fd9
|
Fix case-sensitive folder name for unix platforms.
|
2019-06-11 20:54:01 +02:00 |
Kim Kulling
|
cc10967913
|
Fix the build.
|
2019-06-11 20:17:50 +02:00 |
PK
|
d24b6e220b
|
toolset changes in debug cmake template
|
2019-06-11 15:24:39 +02:00 |
PK
|
03c01004c5
|
toolset also in cmake release template
|
2019-06-11 15:23:05 +02:00 |
PK
|
d448b49ae1
|
fixed MSVC toolset versions >140
according to https://cmake.org/cmake/help/latest/variable/MSVC14.html the use of the MSVC** flags is deprecated, this change uses the encouraged MSVC_VERSION variable.
|
2019-06-11 15:16:53 +02:00 |
Kim Kulling
|
1651f16239
|
Merge pull request #2501 from petrmohelnik/glTF-importer---clean-all-member-arrays
glTF importer - clean all member arrays
|
2019-06-11 11:32:34 +02:00 |
Kim Kulling
|
f76d77955d
|
Merge branch 'master' into reorg
|
2019-06-11 00:22:50 +02:00 |
Kim Kulling
|
2da3a38d60
|
Fix the compile pass, still unresolved symbols.
|
2019-06-10 23:26:00 +02:00 |
Kim Kulling
|
7e20356a20
|
Update XFileParser.cpp
Fix exception.
|
2019-06-10 20:32:56 +02:00 |
RichardTea
|
47c70a8811
|
Merge pull request #12 from assimp/master
fast forward to upstream
|
2019-06-10 10:16:44 +01:00 |
Kim Kulling
|
6fc42cb898
|
Merge branch 'master' into kimkulling-patch-3
|
2019-06-10 00:39:05 +02:00 |
Kim Kulling
|
a4bda3a205
|
Update XFileParser.cpp
Test
|
2019-06-09 21:25:25 +02:00 |
Kim Kulling
|
2d985b92c9
|
Fix references in cmake file.
|
2019-06-09 18:43:56 +02:00 |
petrmohelnik
|
83247e3fbd
|
Merge branch 'master' into glTF-importer---clean-all-member-arrays
|
2019-06-09 15:52:32 +02:00 |
Kim Kulling
|
56d145e26a
|
Merge pull request #2502 from arkeon7/Ogre_with_skeleton_missing
Prevent crash when Ogre skeleton file is missing
|
2019-06-09 01:21:35 +02:00 |
Kim Kulling
|
cbd5c5b284
|
Merge branch 'master' into Ogre_with_skeleton_missing
|
2019-06-08 21:31:47 +02:00 |
Kim Kulling
|
4a46717a77
|
Merge branch 'master' into kimkulling-patch-3
|
2019-06-08 09:09:37 +02:00 |
Kim Kulling
|
7dc38faeba
|
Merge pull request #2483 from akien-mga/code-chmod-644
Remove Unix executable bit on code files
|
2019-06-08 09:05:55 +02:00 |
Arkeon
|
5679dd435a
|
Prevent crash when Ogre skeleton file is missing
|
2019-06-07 09:49:24 +02:00 |
RichardTea
|
ee7a2b6e31
|
Merge pull request #11 from assimp/master
fast forward
|
2019-06-07 08:11:08 +01:00 |
Kim Kulling
|
57c46db042
|
Reorg of code.
|
2019-06-06 14:45:43 +02:00 |
Kim Kulling
|
589a306c85
|
Merge branch 'master' into code-chmod-644
|
2019-06-06 09:16:07 +02:00 |