Permalink
Browse files

Merge pull request #1 from bbarenblat/master

Clarify licensing status
  • Loading branch information...
2 parents 978c201 + 00681fa commit b13e69eab0f9d5108363c4f7391ae649ee85143b Russell committed Sep 2, 2011
Showing with 839 additions and 1 deletion.
  1. +674 −0 COPYING
  2. +23 −1 README
  3. +19 −0 ddrdemo.py
  4. +20 −0 ddrinput.py
  5. +20 −0 renderer.py
  6. +19 −0 rendererdemo.py
  7. +25 −0 tetris.py
  8. +20 −0 tetris_shape.py
  9. +19 −0 util.py
View
674 COPYING

Large diffs are not rendered by default.

Oops, something went wrong.
View
24 README
@@ -1,3 +1,8 @@
+Copyright (C) 2011 Russell Cohen <rcoh@mit.edu>,
+ Leah Alpert <lalpert@mit.edu>
+See the end of the file for license conditions.
+
+
Tetris Instructions:
Run tetris.py to run the game!
@@ -39,4 +44,21 @@ If you write something that is easily testable and mission critical, write a tes
the tests folder. Consult the tests folder of the smootlight code for how
to do that.
-This is going to be boss.
+This is going to be boss.
+
+
+This file is part of Burton-Conner Tetris Battle.
+
+Burton-Conner Tetris Battle 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.
+
+Burton-Conner Tetris Battle 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 Burton-Conner Tetris Battle. If not, see
+<http://www.gnu.org/licenses/>.
View
@@ -1,3 +1,22 @@
+# ddrdemo.py
+# Copyright (C) 2011 Russell Cohen <rcoh@mit.edu>
+#
+# This file is part of Burton-Conner Tetris Battle.
+#
+# Burton-Conner Tetris Battle 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.
+#
+# Burton-Conner Tetris Battle 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 Burton-Conner Tetris Battle. If not, see
+# <http://www.gnu.org/licenses/>.
+
from ddrinput import DdrInput
from ddrinput import DIRECTIONS
from ddrinput import LEFT,RIGHT,UP,DOWN
View
@@ -1,3 +1,23 @@
+# ddrinput.py
+# Copyright (C) 2011 Russell Cohen <rcoh@mit.edu>,
+# Leah Alpert <lalpert@mit.edu>
+#
+# This file is part of Burton-Conner Tetris Battle.
+#
+# Burton-Conner Tetris Battle 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.
+#
+# Burton-Conner Tetris Battle 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 Burton-Conner Tetris Battle. If not, see
+# <http://www.gnu.org/licenses/>.
+
import pygame
import time
View
@@ -1,3 +1,23 @@
+# renderer.py
+# Copyright (C) 2011 Russell Cohen <rcoh@mit.edu>,
+# Leah Alpert <lalpert@mit.edu>
+#
+# This file is part of Burton-Conner Tetris Battle.
+#
+# Burton-Conner Tetris Battle 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.
+#
+# Burton-Conner Tetris Battle 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 Burton-Conner Tetris Battle. If not, see
+# <http://www.gnu.org/licenses/>.
+
from numpy import zeros
import pygame
View
@@ -1,3 +1,22 @@
+# rendererdemo.py
+# Copyright (C) 2011 Russell Cohen <rcoh@mit.edu>
+#
+# This file is part of Burton-Conner Tetris Battle.
+#
+# Burton-Conner Tetris Battle 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.
+#
+# Burton-Conner Tetris Battle 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 Burton-Conner Tetris Battle. If not, see
+# <http://www.gnu.org/licenses/>.
+
"""
Draws some circles on the screen then closes.
"""
View
@@ -1,4 +1,22 @@
#!/usr/bin/env python
+# Burton-Conner Tetris Battle -- Tetris installation controlled by DDR pads
+# Copyright (C) 2010, 2011 Simon Peverett <http://code.google.com/u/@WRVXSlVXBxNGWwl1/>
+# Copyright (C) 2011 Russell Cohen <rcoh@mit.edu>,
+# Leah Alpert <lalpert@mit.edu>
+#
+# 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/>.
+
"""
Tetris Tk - A tetris clone written in Python using the Tkinter GUI library.
@@ -430,4 +448,11 @@ def to_gui_dict(self):
if __name__ == "__main__":
+ print """Burton-Conner Tetris Battle Copyright (C) 2010, 2011 Simon Peverett
+ Copyright (C) 2011 Russell Cohen, Leah Alpert
+This program comes with ABSOLUTELY NO WARRANTY; for details see
+<http://gnu.org/licenses/gpl#section15>.
+This is free software, and you are welcome to redistribute it under certain
+conditions; see <http://gnu.org/licenses/gpl#content> for details."""
+
tetrisGame = TetrisGame()
View
@@ -1,3 +1,23 @@
+# tetris_shape.py
+# Copyright (C) 2010, 2011 Simon Peverett <http://code.google.com/u/@WRVXSlVXBxNGWwl1/>
+# Copyright (C) 2011 Leah Alpert <lalpert@mit.edu>
+#
+# This file is part of Burton-Conner Tetris Battle.
+#
+# Burton-Conner Tetris Battle 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.
+#
+# Burton-Conner Tetris Battle 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 Burton-Conner Tetris Battle. If not, see
+# <http://www.gnu.org/licenses/>.
+
LEFT = "left"
(LEFT, RIGHT, UP, DOWN) = range(4)
direction_d = { LEFT: (-1, 0), RIGHT: (1, 0), DOWN: (0, 1) }
View
19 util.py
@@ -1,3 +1,22 @@
+# util.py
+# Copyright (C) 2011 Russell Cohen <rcoh@mit.edu>
+#
+# This file is part of Burton-Conner Tetris Battle.
+#
+# Burton-Conner Tetris Battle 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.
+#
+# Burton-Conner Tetris Battle 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 Burton-Conner Tetris Battle. If not, see
+# <http://www.gnu.org/licenses/>.
+
from numpy import zeros
import socket
argDict = {'flags': 0, 'startcode': 0x0fff, 'pad':0}

0 comments on commit b13e69e

Please sign in to comment.