Skip to content

Commit

Permalink
License code under MIT and assets under CC BY-NC
Browse files Browse the repository at this point in the history
  • Loading branch information
kyleconroy committed Jun 10, 2012
1 parent 1d2ba32 commit c62f79a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 4 deletions.
7 changes: 7 additions & 0 deletions LICENSE
@@ -0,0 +1,7 @@
Copyright (c) 2012 Kyle Conroy

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
5 changes: 4 additions & 1 deletion Makefile
Expand Up @@ -50,9 +50,12 @@ tag:
git push origin master git push origin master
git push --tags git push --tags


deploy: tag upload s3 deploy: tag upload s3 post

post:
python scripts/post.py $(previous_version) $(current_version) python scripts/post.py $(previous_version) $(current_version)



s3: s3:
python scripts/s3upload.py build/hawkthorne.love $(current_version) python scripts/s3upload.py build/hawkthorne.love $(current_version)
python scripts/s3upload.py build/hawkthorne-osx.zip $(current_version) python scripts/s3upload.py build/hawkthorne-osx.zip $(current_version)
Expand Down
9 changes: 9 additions & 0 deletions README.md
Expand Up @@ -30,3 +30,12 @@ the [.love file][love] and run it. Everyone gets to play!
[osx]: https://github.com/downloads/kyleconroy/hawkthorne-journey/hawkthorne-osx.zip [osx]: https://github.com/downloads/kyleconroy/hawkthorne-journey/hawkthorne-osx.zip
[win32]: https://github.com/downloads/kyleconroy/hawkthorne-journey/hawkthorne-win-x86.zip [win32]: https://github.com/downloads/kyleconroy/hawkthorne-journey/hawkthorne-win-x86.zip
[win64]: https://github.com/downloads/kyleconroy/hawkthorne-journey/hawkthorne-win-x64.zip [win64]: https://github.com/downloads/kyleconroy/hawkthorne-journey/hawkthorne-win-x64.zip

## License

Unless otherwise noted, this code is licensed under the MIT License.

Artwork and audio files are licensed under [CC BY-NC
3.0](http://creativecommons.org/licenses/by-nc/3.0/). Artwork includes all
.png, .psd, .ogg, and .wav files.

6 changes: 3 additions & 3 deletions stats.json
@@ -1,7 +1,7 @@
{ {
"sample": 0, "sample": 0,
"hawkthorne.love": 2176, "hawkthorne.love": 2176,
"hawkthorne-win-x64.zip": 9412, "hawkthorne-win-x64.zip": 10850,
"hawkthorne-win-x86.zip": 8946, "hawkthorne-win-x86.zip": 9798,
"hawkthorne-osx.zip": 7957 "hawkthorne-osx.zip": 9033
} }

0 comments on commit c62f79a

Please sign in to comment.