djsundog
/
obj2gltf
mirror of https://github.com/CesiumGS/obj2gltf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
395 Commits 5 Branches 32 Tags 1.1 MiB
Commit Graph

395 Commits

Author SHA1 Message Date
Ed Mackey 1b9f54ef22 Merge pull request #77 from AnalyticalGraphicsInc/tr 
Treat alpha as 1.0 - Tr
 2017-05-19 11:19:43 -04:00
Sean Lilley f62e2bd6cf Fix test 2017-05-18 09:37:45 -04:00
Sean Lilley 86c604826c Treat alpha as 1.0 - Tr 2017-05-18 09:32:06 -04:00
Sean Lilley c2af8f5098 Tests 2017-05-10 13:10:59 -04:00
Sean Lilley 44e9d5fa3b Add back KHR_materials_common 2017-05-04 15:39:01 -04:00
Sean Lilley dc4ba7fc6a Merge branch 'master' into gltf-2.0 2017-05-04 14:34:33 -04:00
Sean Lilley c9ad66fcdb Add metallicRoughness and specularGlosiness output 2017-05-04 14:25:08 -04:00
Ed Mackey cab8911223 Merge pull request #72 from AnalyticalGraphicsInc/error-reporting 
Return Promise.reject instead of throwing error
 2017-04-27 15:06:41 -04:00
Sean Lilley 81201dcd03 Return Promise.reject instead of throwing error 2017-04-27 13:35:47 -04:00
Sean Lilley 9213047cbb Fix CHANGES.md 2017-04-25 16:45:03 -04:00
Sean Lilley 74f95cd616 Bump to 1.1.0 2017-04-25 16:39:19 -04:00
Ed Mackey f9c0e130aa Merge pull request #62 from AnalyticalGraphicsInc/single-bin 
Don't save out two bins
 2017-04-25 16:27:31 -04:00
Sean Lilley 403e4cf68e Spec improvements 2017-04-25 13:02:14 -04:00
likangning93 930b14a350 Merge pull request #68 from AnalyticalGraphicsInc/up-axis 
Options to convert up axis
 2017-04-25 10:15:34 -04:00
Rob Taglang 2327a882ce Merge pull request #70 from AnalyticalGraphicsInc/fix-ambient 
Fix ambient of 1,1,1
 2017-04-23 13:42:55 -04:00
Sean Lilley 20bbd17cd9 Fix ambient of 1,1,1 2017-04-23 13:34:09 -04:00
Sean Lilley ec7acba6a9 Fix doc 2017-04-20 15:09:03 -04:00
Sean Lilley 6f99265a65 Merge branch 'master' into single-bin 2017-04-20 14:56:45 -04:00
Sean Lilley 1ccf070a6e Fix tests 2017-04-20 14:55:47 -04:00
Sean Lilley 93dac5ebdc Convert up axis 2017-04-20 14:43:59 -04:00
Sean Lilley d6d0d392c6 Remove occurences of khr_materials_common for code (not tests yet) 2017-04-20 10:23:00 -04:00
Sean Lilley d0e8b90566 Merge branch 'master' into gltf-2.0 2017-04-20 10:13:45 -04:00
Sean Lilley d7a354b313 Use temp directory 2017-04-20 10:07:01 -04:00
Shehzan Mohammed 9afaf48a61 Merge pull request #65 from AnalyticalGraphicsInc/fix-names 
Fix spec file names
 2017-04-20 09:34:51 -04:00
Sean Lilley ce5221c80a 2.0 2017-04-19 17:53:10 -04:00
Sean Lilley 63a5178441 Fixed spec names 2017-04-19 15:48:07 -04:00
Sean Lilley a6ff230fc3 Don't save out two bins 2017-04-14 12:00:43 -04:00
Sean Lilley 45feac8dd0 Fix 2017-04-13 10:29:56 -04:00
Sean Lilley 212aed8e8a Update package.json and CHANGES.md 2017-04-13 10:28:20 -04:00
Sean Lilley fb28eed9cd Add Webstorm project file 2017-04-13 10:13:03 -04:00
Sean Lilley a73963206a Merge pull request #60 from AnalyticalGraphicsInc/renaming 
Renaming files
 2017-04-13 10:08:54 -04:00
Sean Lilley 37febbcd93 Renaming files 2017-04-12 16:55:03 -04:00
Patrick Cozzi 74a7349d19 Merge pull request #49 from AnalyticalGraphicsInc/major-cleanup 
Refactor and Tests
 2017-04-11 20:12:28 -04:00
Sean Lilley cc8fee19c4 Many updates 2017-04-11 17:38:03 -04:00
Sean Lilley 28d081e0ae Remove TODO comment, moved to isse 2017-04-05 13:17:31 -04:00
Sean Lilley e93e7106b7 Add missing test files 2017-04-05 10:49:31 -04:00
Sean Lilley 965402c535 Handle file path errors and better promise handling 2017-04-05 10:44:28 -04:00
Sean Lilley 72c20eb6ee Fix output file name 2017-04-05 09:13:28 -04:00
Sean Lilley bedbb6ef96 Fix tests and jshint 2017-04-04 17:57:01 -04:00
Sean Lilley 02c3aa18db Support KHR_materials_common output 2017-04-04 17:55:00 -04:00
Sean Lilley c7b4fc3cb1 Custom logger 2017-04-04 17:33:25 -04:00
Sean Lilley 3c958e1d86 Add secure checking of paths 2017-04-04 16:45:21 -04:00
Sean Lilley e4b3ad5409 Style 2017-04-04 15:09:58 -04:00
Sean Lilley 04ad694599 Trigger coverall 2017-04-04 11:32:18 -04:00
Sean Lilley 74c91320a5 Travis coveralls fix 2017-04-04 11:24:39 -04:00
Sean Lilley be07ab0ce1 Added coveralls 2017-03-22 16:50:03 -04:00
Sean Lilley e3941daf8c Fix 2017-03-21 14:51:48 -04:00
Sean Lilley 83e7723b1c Transparency and other updates 2017-03-21 14:43:09 -04:00
Sean Lilley e48320572b Fix base path since separate resources are saved in the output folder 2017-03-21 11:29:02 -04:00
Sean Lilley 4583b38ebc Updated LICENSE.md 2017-03-17 16:13:08 -04:00