diff --git a/CHANGELOG.md b/CHANGELOG.md index a9ade489..5033eb1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,13 @@ CHANGELOG =========== -## 3.0.3 ([see diff](https://github.com/toxicFork/react-three-renderer/compare/v3.0.2...v3.0.3)) +## 3.1.0 ([see diff](https://github.com/toxicFork/react-three-renderer/compare/v3.0.2...v3.1.0)) + +This is a strange release that was slightly frustrating to implement. ### Core +- Fix compatibility for `three@~0.84.0`! +- Fix compatibility for `react@~15.5.3`! - Fix building and testing on Windows (sorry!) - Use more gulp and less bash - Test that yarn works too (yep) diff --git a/README.md b/README.md index fc75e945..45565ad2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Would you like to know more? [See the wiki](https://github.com/toxicFork/react-t > This is still an experimental and work in progress project, use at your own risk! -> Currently supported react version: `15.4.1` ( things break fast when you fly this close to the sun ) +> Currently supported react version: `15.5.3` ( things break fast when you fly this close to the sun ) [![Join the chat at https://gitter.im/toxicFork/react-three-renderer](https://badges.gitter.im/toxicFork/react-three-renderer.svg)](https://gitter.im/toxicFork/react-three-renderer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/toxicFork/react-three-renderer.svg)](https://travis-ci.org/toxicFork/react-three-renderer) @@ -19,7 +19,7 @@ Installation ============ ``` -npm install --save react@15.4.1 react-dom@15.4.1 three@0.82.1 +npm install --save react@15.5.3 react-dom@15.5.3 three@0.84.0 npm install --save react-three-renderer ``` diff --git a/package.json b/package.json index 8eef51ed..0a718915 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,9 @@ "fbjs": "0.8.12" }, "peerDependencies": { - "react": "~15.4.0", - "react-dom": "~15.4.0", - "three": "~0.82.1" + "react": "~15.5.3", + "react-dom": "~15.5.3", + "three": "~0.84.0" }, "devDependencies": { "babel-cli": "6.24.1", diff --git a/wiki/extrudeGeometry.md b/wiki/extrudeGeometry.md index 1c4bdc0b..ce67b818 100644 --- a/wiki/extrudeGeometry.md +++ b/wiki/extrudeGeometry.md @@ -58,8 +58,8 @@ once sent to GPU. ### curveSegments ``` number ```: Default is 12 (not used in three.js at the moment) -### material -``` number ```: Index of the material in a material list +### settings +``` any ``` ### UVGenerator ``` @@ -71,9 +71,6 @@ shape of ``` A UV generator, defaults to ExtrudeGeometry's WorldUVGenerator -### settings -``` any ``` - ### steps ``` number ``` diff --git a/wiki/shapeGeometry.md b/wiki/shapeGeometry.md index c376a0f8..ed1d803c 100644 --- a/wiki/shapeGeometry.md +++ b/wiki/shapeGeometry.md @@ -49,19 +49,6 @@ once sent to GPU. ### curveSegments ``` number ```: Default is 12 (not used in three.js at the moment) -### material -``` number ```: Index of the material in a material list - -### UVGenerator -``` -shape of -{ - generateTopUV: function, - generateSideWallUV: function -} -``` -A UV generator, defaults to ExtrudeGeometry's WorldUVGenerator - ### resourceId ``` string ```: The resource id of this object, only used if it is placed into [[resources]].