Commit Graph

425 Commits

Author SHA1 Message Date
Eli Bogomolny 28fdfc35e4
Merge pull request #270 from CesiumGS/node-16
Upgrade packages and run Node 16 on CI
2021-10-15 15:24:46 -04:00
Sean Lilley 08250bf48c Upgrade packages and run Node 16 on CI 2021-10-15 15:01:14 -04:00
Sean Lilley 359341f50c Update version to 3.1.3 2021-09-15 12:16:51 -04:00
Sean Lilley 39d817da90 Lock CesiumJS to 1.84.0. Fixes https://github.com/CesiumGS/obj2gltf/issues/266 2021-09-15 12:14:45 -04:00
Ian Lilley 049f7af86b
Merge pull request #268 from CesiumGS/fix-missing-mtl
Fix unhandled error when mtl is missing
2021-09-15 12:13:49 -04:00
Sean Lilley ab060bb185 Update CHANGES.md 2021-09-15 12:08:04 -04:00
Sean Lilley a62de758dc Fix unhandled error when obj or mtl is missing 2021-09-15 11:57:28 -04:00
Sean Lilley 3f8d2e6af7
Merge pull request #259 from hawkaa/hakon/tinkercad
feat: allow for tab separated obj from Tinkercad
2021-09-07 09:53:54 -04:00
Håkon Åmdal 9c29cc96d7 feat: allow for tab separated obj from Tinkercad
This commit changes patterns for obj line parsing to recognize files where
the elements are separated by any whitespace (regex \s). This way, we support
files exported from Tinkercad.
2021-09-07 14:31:54 +02:00
Sean Lilley 6e3441319a Update CHANGES.md for 3.1.2 release 2021-08-02 12:00:16 -04:00
Sean Lilley 4d76656b97 Make obj2gltf.js executable 2021-08-02 12:00:16 -04:00
Ian Lilley 09dd1e06ee
Merge pull request #257 from CesiumGS/prettier-auto-formatting
Prettier in travis and on commit
2021-08-02 08:41:12 -07:00
Sean Lilley 944c68a191 Add auto-formatting 2021-08-02 11:34:02 -04:00
Sean Lilley dc3ec3074f Run prettier 2021-08-02 11:31:59 -04:00
Ian Lilley bd4b7320fa
Merge pull request #256 from CesiumGS/prettier
Switch to prettier for formatting
2021-08-02 08:28:21 -07:00
Sean Lilley d782d78f2a Remove auto-formatting temporarily 2021-08-02 10:47:07 -04:00
Sean Lilley a563a8bccc Switch to prettier for formatting 2021-08-02 10:46:58 -04:00
Ian Lilley 6778d19746
Merge pull request #236 from CesiumGS/remove-triangle-winding-order-check
Remove winding order sanitization for triangles
2021-08-01 17:26:40 -07:00
Sean Lilley 49df1a0655 Added test 2021-08-01 20:20:49 -04:00
Sean Lilley 5fc3ff8d6e Add triangle winding order sanitization option 2021-08-01 20:20:49 -04:00
Sean Lilley fb491952fc Update CHANGES 2021-08-01 20:20:22 -04:00
Sean Lilley b69281573f Remove triangle winding order check 2021-08-01 20:19:25 -04:00
Ian Lilley 3283239024
Merge pull request #240 from CesiumGS/remove-sampler-filter
Remove minFilter and magFilter
2021-08-01 17:18:48 -07:00
Sean Lilley 4270358310 Remove minFilter and magFilter 2021-08-01 18:25:56 -04:00
Sean Lilley 2634c25e33 Update to 3.1.1 2021-07-22 20:02:59 -04:00
Ian Lilley edc8e8e063
Merge pull request #254 from CesiumGS/update-npm-libraries
Update npm dependencies
2021-07-22 16:56:06 -07:00
Sean Lilley 0a496ccef7 Update travis to Node 12 2021-07-22 19:46:35 -04:00
Sean Lilley bf4f5fd973 Fix coerce usage 2021-07-22 19:42:28 -04:00
Sean Lilley 2516510682 Update npm libraries 2021-07-22 19:39:43 -04:00
Sean Lilley beb8ce095d master -> main 2021-07-16 19:19:16 -04:00
Sean Lilley 79848febe3
Merge pull request #245 from CesiumGS/update-packages
Update packages
2020-07-27 13:37:13 -04:00
Sean Lilley 2f31f636b6 Update packages 2020-07-27 13:29:52 -04:00
Sean Lilley 53beb9852f
Merge pull request #237 from CesiumGS/update-packages
Update packages
2020-04-02 11:48:16 -04:00
Sean Lilley b6c5bc9fe5 Update packages 2020-04-02 11:46:37 -04:00
Sean Lilley fb641e8c16 Remove greenkeeper badge 2020-03-19 14:27:54 -04:00
Sean Lilley c5aaa64d09 3.1.0 release 2020-03-13 11:15:40 -04:00
Sean Lilley 7088eb50ad Remove .idea 2020-02-18 17:31:38 -05:00
Sean Lilley a481795f9e Change other url 2020-02-18 17:30:30 -05:00
Sean Lilley 8b21415b4d Change cesium js url 2020-02-18 17:22:09 -05:00
Shehzan Mohammed 7f8da36f2e
Merge pull request #231 from CesiumGS/cesiumgs
Change links from AnalyticalGraphicsInc to CesiumGS
2020-02-18 16:38:57 -05:00
Sean Lilley 5ed44f281d Switch to CesiumJS github org 2020-02-18 10:06:04 -05:00
Sean Lilley 7c32f87413
Merge pull request #230 from AnalyticalGraphicsInc/update-version
Update Travis Node version to 10
2020-02-04 10:23:09 -05:00
Sean Lilley 70cb473bdb Merge branch 'master' into update-version 2020-02-04 10:14:03 -05:00
Sean Lilley fb103f467c Update Travis node version 2020-02-04 10:11:42 -05:00
Sean Lilley 7d43c32422
Merge pull request #224 from AnalyticalGraphicsInc/greenkeeper/yargs-15.0.1
Update yargs to the latest version 🚀
2019-12-22 21:10:59 -05:00
Sean Lilley 4bce77935d
Merge pull request #228 from AnalyticalGraphicsInc/greenkeeper/nyc-15.0.0
Update nyc to the latest version 🚀
2019-12-22 21:10:44 -05:00
greenkeeper[bot] 806fe9d71e
chore(package): update nyc to version 15.0.0 2019-12-23 01:20:02 +00:00
greenkeeper[bot] 1173323d18
fix(package): update yargs to version 15.0.1 2019-11-16 22:57:23 +00:00
Omar Shehata 4df7c2a28d
Merge pull request #219 from AnalyticalGraphicsInc/absolute-paths
Handle mtl and texture absolute paths
2019-10-29 14:17:29 -04:00
Sean Lilley dd163b77bd
Merge branch 'master' into absolute-paths 2019-10-29 13:59:34 -04:00