Permalink
Browse files

merge from gh-pages with attribution

  • Loading branch information...
1 parent 91186fa commit 459691fbc89567d5eed4677394f1ebc0519a8726 @cgack committed Jul 29, 2012
View
@@ -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
View
@@ -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
View
Deleted file not rendered
View
Binary file not shown.
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
View
Deleted file not rendered
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 459691f

Please sign in to comment.