Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/1044-fix-ios-pointer
Browse files Browse the repository at this point in the history
  • Loading branch information
eonarheim committed Oct 12, 2018
2 parents e295e26 + 0c2f7ed commit 12cdba7
Show file tree
Hide file tree
Showing 16 changed files with 9 additions and 1,633 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Changed

- Excalibur user documentation has now moved to [excaliburjs.com/docs](https://excaliburjs.com/docs)
- Excalibur will now prompt for user input before starting the game to be inline with the new webaudio requirments from chrome/mobile browsers ([#1031](https://github.com/excaliburjs/Excalibur/issues/1031))

### Deprecated
Expand Down Expand Up @@ -300,7 +301,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- `ex.Detector.getBrowserFeatures()` to retrieve the support matrix of the current browser
- `ex.Detector.logBrowserFeatures()` to log the support matrix to the console (runs at startup when in Debug mode)
- Added @obsolete decorator to help give greater visibility to deprecated methods ([#684](https://github.com/excaliburjs/Excalibur/issues/684))
- Added better support for module loaders and TypeScript importing. See [Installation](http://docs.excaliburjs.com/en/latest/installation.html) docs for more info. ([#606](https://github.com/excaliburjs/Excalibur/issues/606))
- Added better support for module loaders and TypeScript importing. See [Installation](https://excaliburjs.com/docs/installation) docs for more info. ([#606](https://github.com/excaliburjs/Excalibur/issues/606))
- Added new Excalibur example project templates ([#706](https://github.com/excaliburjs/Excalibur/issues/706), [#733](https://github.com/excaliburjs/Excalibur/issues/733)):
- [Browserify](https://github.com/excaliburjs/example-ts-browserify)
- [Webpack](https://github.com/excaliburjs/example-ts-webpack)
Expand Down
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,18 @@ Excalibur is an open source project licensed under the 2-clause BSD license (thi

# Get Started

Our user documentation is at http://docs.excaliburjs.com.
Our user documentation is at https://excaliburjs.com/docs.

- Follow our [Installation](http://docs.excaliburjs.com/en/latest/installation.html) guide to learn how to install Excalibur
- Follow our [Getting Started](http://docs.excaliburjs.com/en/latest/quickstart.html) guide if you're looking to get started.
- Learn what [Features](http://docs.excaliburjs.com/en/latest/features.html) are available for you to leverage in your games
- Follow our [Installation](https://excaliburjs.com/docs/installation) guide to learn how to install Excalibur
- Follow our [Getting Started](https://excaliburjs.com/docs/getting-started) guide if you're looking to get started.
- Learn what [Features](https://excaliburjs.com/docs/features) are available for you to leverage in your games
- View the [Release roadmap](https://github.com/excaliburjs/Excalibur/milestones) to see what's coming next

:exclamation: **_Note:_** We are still in version 0.x, which means this project may be a little rough around the edges. We try to minimize API changes, but breaking changes **will occur** in new released versions. Excalibur is a labor of love and the product of many hours of spare time. Thanks for checking it out!

# API Documentation
# API Reference

Visit the [API Documentation](http://docs.excaliburjs.com/en/latest/index.html#api-documentation) section for fully-annotated documentation of the API.

The `master` branch documentation is always available and up-to-date on our [Edge documentation site](http://excaliburjs.com/docs/api/edge).
Visit the [API Reference](https://excaliburjs.com/docs/api/edge) section for fully-annotated documentation of the API.

# Questions

Expand Down
216 changes: 0 additions & 216 deletions docs/Makefile

This file was deleted.

5 changes: 0 additions & 5 deletions docs/Readme.md

This file was deleted.

0 comments on commit 12cdba7

Please sign in to comment.