Skip to content

Commit

Permalink
Merge branch 'release/v0.6.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
ColdenCullen committed Apr 25, 2014
2 parents 9f76645 + 89d16fc commit 45755c4
Show file tree
Hide file tree
Showing 15 changed files with 501 additions and 433 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ install:
- sudo apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring
- sudo apt-get update
- sudo apt-get install dmd-bin dub libfreeimage-dev libjpeg62-dev
- sudo dub install x11
- sudo dub fetch x11
- sudo dub add-local . ~master
- cd ../
- sudo git clone https://github.com/Circular-Studios/Sample-Dash-Game.git
Expand Down
16 changes: 9 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing to Dash

First of all, thanks for choosing Dash! We really hope you enjoy your time working with our engine. To get setup with the engine, see our page on [setting up your environment](https://github.com/Circular-Studios/Dash/wiki/Setting-Up-Your-Environment-(Engine\)).
First of all, thanks for choosing Dash! We really hope you enjoy your time working with our engine. To get setup with the engine, see our page on [setting up your environment](https://github.com/Circular-Studios/Dash/wiki/Setting-Up-Your-Environment).

## Communication

Expand All @@ -18,12 +18,14 @@ We use [semantic versioning](http://semver.org/). Each minor version gets a mile

All major features or enhancements being added are done on feature branches, then merged to develop through Pull Requests. Pull requests should be named as `Type: Name`, where `Type` could be `Feature`, `Refactor`, `Cleanup`, etc.

Issues should be created for all tasks and bugs. Issues should be assigned to a milestone, and then claimed by a developer.
## Issue Tracking

## What to Work On
Now that you know how to contribute, you may be wondering what to work on. In order to help all of our contributors work effectively on tasks, we will maintain a straightforward issue tracking strategy through Dash's [waffle.io page](https://waffle.io/circular-studios/dash).

Now that you know how to contribute, you may be wondering what to work on.
If you are looking for something to work on, your first step should be to go to the **Ready** column, however here is an overview of the tracking strategy we've adopted:

If you're looking for a large task, the first place to look would be on the [Planned Features](https://github.com/Circular-Studios/Dash/wiki/Planned-Features) page. This is where the list of all of the big things we want lives.

If you're looking for an intro to the code base, or only really have time for little things, check out the "Ready" column of our [waffle.io board](https://waffle.io/Circular-Studios/Dash). Things here could range from adding support for loading YAML arrays to fixing a bug in the linux build.
* **New**: if you find a bug, want to suggest a feature, or see a need for optimization, feel free to create a new issue. These issues will be tracked in the New column until we have had time to review them.
* **Accepted**: tracks issues that we have approved as relevant to the project. For bugs, this means that we've reporduced the bug and accept that it's not as-intended. For features, this means we have reviewed that the feature fits with our vision of the Dash engine and is something we actually plan to support.
* **Ready**: tracks issues which we have determined are ready for implementation. Sometimes features will be accepted, but the current state of the engine is not at a place where the issue is worth working on. Once we feel the engine is ready to support a given issue, we will transition the issue to ready.
* **In Progress**: tracks issues which are currently being developed. If you are beginning work on an issue, please comment on the issue with a relevant fork branch, and we will move the issue to this column.
* **Done**: closed issues end up here.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

If you're reading this page, chances are you fall into one of the following categories:

#### I am a game devloper interested in making games with Dash:
#### I am a game developer interested in making games with Dash:

Our [readme.io page](http://dash.circularstudios.com/) has all the info you could ever want for building a game with Dash. Pro tip: you'll want to read up on [YAML](http://www.yaml.org/) and [D](http://dlang.org) before getting started.

Expand All @@ -18,4 +18,4 @@ The easiest way to get Dash running (on Windows) is to head over to our [Release

### Contact Us

We'd love to hear from you, feel free to hit us up in [gitter](https://gitter.im/Circular-Studios/Dash) or email us at dash [at] circularstudios [dot] com. We'll do our best to have the appropriate team member respond as quickly as we can.
We'd love to hear from you, feel free to get in touch using [gitter](https://gitter.im/Circular-Studios/Dash) (our public chat room) or email us at dash [at] circularstudios [dot] com. We'll do our best to have the appropriate team member respond as quickly as we can.
Loading

0 comments on commit 45755c4

Please sign in to comment.