Se cambiaron los sonidos por algunos con licencia CC

dan-zx · May 15, 2014 · 2025063 · 2025063
1 parent cd5d0a3
commit 2025063
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 8 deletions.
diff --git a/app/assets/libs-licenses.html b/app/assets/libs-licenses.html
@@ -30,7 +30,7 @@
     	<ul>
             <li>google-play-services.aar</li>
         </ul>
-        <pre id="google-play-services-pre">
+        <pre>
 Copyright (c) 2005-2008, The Android Open Source Project
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -49,7 +49,7 @@ <h3>Testing libs</h3>
     	<ul>
             <li>robolectric-2.2-jar-with-dependencies.jar</li>
         </ul>
-        <pre id="robolectric-pre">
+        <pre>
 The MIT License
 
 Copyright (c) 2010 Xtreme Labs and Pivotal Labs
@@ -75,7 +75,7 @@ <h3>Testing libs</h3>
         <ul>
             <li>fest-assert-core-2.0M10.jar</li>
         </ul>
-        <pre id="fest-assert-pre">
+        <pre>
 Copyright (c) 2014, FEST-Assert contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -93,7 +93,7 @@ <h3>Testing libs</h3>
         <ul>
             <li>junit-4.11.jar</li>
         </ul>
-        <pre id="junit-pre">
+        <pre>
 JUnit
 
 Eclipse Public License - v 1.0
@@ -311,7 +311,7 @@ <h3>Testing libs</h3>
         <ul>
             <li>mockito-all-1.9.5.jar</li>
         </ul>
-        <pre id="mockito-pre">
+        <pre>
 The MIT License
 
 Copyright (c) 2007 Mockito contributors
@@ -337,7 +337,7 @@ <h3>Testing libs</h3>
         <ul>
             <li>robotium-solo-5.1.jar</li>
         </ul>
-        <pre id="mockito-pre">
+        <pre>
 Copyright [2012] [Robotium Developers]
 
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/app/assets/sfx-licenses.html b/app/assets/sfx-licenses.html
@@ -30,7 +30,7 @@
     	<ul>
             <li>The Distance</li>
         </ul>
-        <pre id="the-distance-pre">
+        <pre>
 "The Distance" 
 by dj_nen
 
@@ -40,12 +40,78 @@
     	<ul>
             <li>Tetris - (Music A)</li>
         </ul>
-        <pre id="robolectric-pre">
+        <pre>
 "Tetris - (Music A)" 
 by Manuel Mora
 
 2009 - Licensed under
 Creative Commons
+Attribution Noncommercial (3.0)
+        </pre>
+        <ul>
+            <li>Level up sound effect</li>
+        </ul>
+        <pre>
+"Level up sound effects" 
+by Bart Kelsey
+
+2014 - Licensed under
+Creative Commons
+Attribution Noncommercial (3.0)
+        </pre>
+		<ul>
+            <li>Mario Jumping</li>
+        </ul>
+        <pre>
+"Mario Jumping" 
+by Mike Koenig
+
+2010 - Licensed under
+Creative Commons
+Attribution Noncommercial (3.0)
+        </pre>
+		<ul>
+            <li>Fall on the floor</li>
+        </ul>
+        <pre>
+"Fall on the floor" 
+by Evinawer
+
+2013 - Licensed under
+Creative Commons
+Attribution Noncommercial (3.0)
+        </pre>
+		<ul>
+            <li>Reload 4</li>
+        </ul>
+        <pre>
+"Reload 4" 
+by killkhan
+
+2012 - Licensed under
+Creative Commons
+Attribution Noncommercial (3.0)
+        </pre>
+		<ul>
+            <li>Game Over</li>
+        </ul>
+        <pre>
+"Game Over" 
+by makkuzu
+
+2014 - Licensed under
+Creative Commons
+Attribution Noncommercial (3.0)
+        </pre>
+		<ul>
+            <li>Champaign Cork</li>
+        </ul>
+        <pre>
+"Champaign Cork" 
+by dreeke
+
+2014 - Licensed under
+Creative Commons
 Attribution Noncommercial (3.0)
         </pre>
     </body>

diff --git a/app/res/raw/on_drop.mp3 b/app/res/raw/on_drop.mp3
diff --git a/app/res/raw/on_game_over.mp3 b/app/res/raw/on_game_over.mp3
diff --git a/app/res/raw/on_level_up.mp3 b/app/res/raw/on_level_up.mp3
diff --git a/app/res/raw/on_line_clear.mp3 b/app/res/raw/on_line_clear.mp3
diff --git a/app/res/raw/on_pause.mp3 b/app/res/raw/on_pause.mp3
diff --git a/app/res/raw/on_rotate.mp3 b/app/res/raw/on_rotate.mp3