Mercurial > nagslang

changeset 639:0c7fcd207445

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author David Sharpe <decoydavid@gmail.com>
date Sun, 08 Sep 2013 01:39:30 +0200
parents 30d7982f43dc (current diff) d66b6fce6f9b (diff)
children 5b8a436ed08f 4cf19c6734ec
files
diffstat 4 files changed, 22 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/data/levels/end	Sun Sep 08 01:38:36 2013 +0200
+++ b/data/levels/end	Sun Sep 08 01:39:30 2013 +0200
@@ -99,7 +99,7 @@
   classname: Note
   name: blast_off
 lines: []
-music: POL-cyber-factory-short.ogg
+music: POL-off-road-short.ogg
 music_volume: 0.3
 polygons:
   1:
Binary file data/music/POL-off-road-short.ogg has changed
--- a/data/music/SOURCES.txt	Sun Sep 08 01:38:36 2013 +0200
+++ b/data/music/SOURCES.txt	Sun Sep 08 01:39:30 2013 +0200
@@ -96,6 +96,25 @@
     Ogg generated using 'oggenc POL-tunnels-short.wav'
 
 
+POL-off-road-short.ogg
+---------------------
+
+URL:
+    http://www.backgroundmusicloops.net/free-music-loops/POL-off-road-short.zip
+Source:
+    http://www.playonloop.com/2010-music-loops/off-road/
+License:
+    http://creativecommons.org/licenses/by/3.0/
+Credit:
+    This royalty-free music loop is filed under the Lite Rock > Rock
+    category, tagged as Action, Aggressive, Driving and is ready for
+    instant download! You can use this background music loop in any
+    kind of production such as Video, Game, Flash, Website, Slideshow,
+    Presentation, Mobile App, Radio, TV, and much more!
+Notes:
+    Ogg generated using 'oggenc -q -1 POL-off-road-short.wav'
+
+
 moonlight-sonata.ogg
 --------------------
 
--- a/run_game.pyw	Sun Sep 08 01:38:36 2013 +0200
+++ b/run_game.pyw	Sun Sep 08 01:39:30 2013 +0200
@@ -1,3 +1,3 @@
-import yourgameshortname.main
+import nagslang.__main__
 if __name__ == "__main__":
-    yourgameshortname.main.main()
+    nagslang.__main__.main()