Skip to content

Commit

Permalink
merge from gh-pages with attribution
Browse files Browse the repository at this point in the history
  • Loading branch information
cgack committed Jul 29, 2012
1 parent 91186fa commit 459691f
Show file tree
Hide file tree
Showing 14 changed files with 1,144 additions and 3 deletions.
70 changes: 70 additions & 0 deletions AUTHORS.txt
@@ -0,0 +1,70 @@
Code authors
============

This program was written by the following people:
- Cory Gackenheimer


Asset attribution
=================

Assets were authored by the following people:

Lanea Zimmerman
- barrel.png
- cabinets.png
- country.png
- cup.png
- dirt.png
- dirt2.png
- grass.png
- hole.png
- house.png
- inside.png
- lava.png
- lavarock.png
- treetop.png
- trunk.png
- waterfall.png
- watergrass.png
- water.png
- lpc_home_cup.gif //co-author

Jonathan Palecek (Creative Commons)
- lpc_home_cup.gif //co-author


Charles Sanchez
- bat.png

Barbara Rivera
- malesoldierzombie.png
- malesoldiernormal.png

Brandon
- Calm Town (music) calmtown.ogg

Daniel Eddeland
- fence.png
- magic_firelion_sheet.png
- magic_iceshield_sheet.png
- magic_torrentacle.png

Johann CHARLOT
- tileset01.png

Johnathan Roatch
- chomp.flac (sfx)
- chomp.ogg (coverted from flac)
- closing-umbrella.flac (sfx)
- closing-umbrella.ogg (coverted from flac)
- metal-bowl.flac (sfx)
- metal-bowl.ogg (coverted from flac)

Luke Mehl
- dark_mage_elder.png
- dark_mage_queen.png
- forest_mage.png
- gray_mage.png
- red_novice.png
- royal_mage.png
37 changes: 37 additions & 0 deletions COPYING.txt
@@ -0,0 +1,37 @@
========================
Software and source code
========================

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

For details on authorship, see AUTHORS.txt


========================================
Artwork, music, and other assets/content
========================================

Artwork, music, and other non-software assets/content in this
repository are dual licensed under the Creative Commons
Attribution-ShareAlike 3.0 Unported and the GNU General Public License
as published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.

You should have received a copy of the GNU General Public License
along with this work. If not, see <http://www.gnu.org/licenses/>.
Likewise, you should have received a copy of the Creative Commons
Attribution-ShareAlike 3.0 Unported legalcode with this work. If not,
see <http://creativecommons.org/licenses/by-sa/3.0/>.

For details on authorship of various resources, see AUTHORS.txt
Binary file removed assets/32x32_font.png
Binary file not shown.
Binary file added assets/magic/.DS_Store
Binary file not shown.
Binary file removed assets/magic/magic_firelion_big.png
Binary file not shown.
Binary file removed assets/magic/magic_snakebite_sheet.png
Binary file not shown.
Binary file removed assets/magic/turtleshell_front.png
Binary file not shown.
Binary file removed assets/magic/turtleshell_side.png
Binary file not shown.
Binary file removed assets/md_pixelfont.png
Binary file not shown.
359 changes: 359 additions & 0 deletions cc-by-sa-3.0.txt

Large diffs are not rendered by default.

0 comments on commit 459691f

Please sign in to comment.