diff options
| author | Fernando Carmona Varo <ferkiwi@gmail.com> | 2015-10-27 01:02:12 +0100 |
|---|---|---|
| committer | Fernando Carmona Varo <ferkiwi@gmail.com> | 2015-10-27 01:02:12 +0100 |
| commit | 97cebf050265bf2ebbffd7770d57b3ed0b911bf8 (patch) | |
| tree | d232baa5522cdd1c0feadde7c222342940544d84 /mario/sounds | |
| parent | 087713746ba1b8cac4ce5142fa136d3bde56cca6 (diff) | |
| parent | ff0c1eef4b5e4e06b02b164509590c18e7b450b9 (diff) | |
Merge branch 'master' of https://github.com/DonBatman/myarcade
Conflicts:
mario/init.lua
mario/turtle.lua
Diffstat (limited to 'mario/sounds')
| -rw-r--r-- | mario/sounds/mario-1-up.ogg | bin | 0 -> 28681 bytes |
| -rw-r--r-- | mario/sounds/mario-bonus.ogg | bin | 0 -> 153519 bytes |
| -rw-r--r-- | mario/sounds/mario-continue.ogg | bin | 0 -> 19741 bytes |
| -rw-r--r-- | mario/sounds/mario-game-over.ogg | bin | 0 -> 56498 bytes |
| -rw-r--r-- | mario/sounds/mario-game-start.ogg | bin | 0 -> 59419 bytes |
| -rw-r--r-- | mario/sounds/mario-next-level-start.ogg | bin | 0 -> 23164 bytes |
| -rw-r--r-- | mario/sounds/mario_coin.ogg | bin | 0 -> 4814 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/mario/sounds/mario-1-up.ogg b/mario/sounds/mario-1-up.ogg Binary files differnew file mode 100644 index 0000000..f0a08ab --- /dev/null +++ b/mario/sounds/mario-1-up.ogg diff --git a/mario/sounds/mario-bonus.ogg b/mario/sounds/mario-bonus.ogg Binary files differnew file mode 100644 index 0000000..2fb7688 --- /dev/null +++ b/mario/sounds/mario-bonus.ogg diff --git a/mario/sounds/mario-continue.ogg b/mario/sounds/mario-continue.ogg Binary files differnew file mode 100644 index 0000000..270f2f7 --- /dev/null +++ b/mario/sounds/mario-continue.ogg diff --git a/mario/sounds/mario-game-over.ogg b/mario/sounds/mario-game-over.ogg Binary files differnew file mode 100644 index 0000000..9c66411 --- /dev/null +++ b/mario/sounds/mario-game-over.ogg diff --git a/mario/sounds/mario-game-start.ogg b/mario/sounds/mario-game-start.ogg Binary files differnew file mode 100644 index 0000000..0d90de2 --- /dev/null +++ b/mario/sounds/mario-game-start.ogg diff --git a/mario/sounds/mario-next-level-start.ogg b/mario/sounds/mario-next-level-start.ogg Binary files differnew file mode 100644 index 0000000..7e7644f --- /dev/null +++ b/mario/sounds/mario-next-level-start.ogg diff --git a/mario/sounds/mario_coin.ogg b/mario/sounds/mario_coin.ogg Binary files differnew file mode 100644 index 0000000..aa789b0 --- /dev/null +++ b/mario/sounds/mario_coin.ogg |