diff options
| -rw-r--r-- | assets/mus/game/adieu.mp3 | bin | 0 -> 1628662 bytes | |||
| -rw-r--r-- | assets/mus/game/adieu.wav | bin | 20558816 -> 0 bytes | |||
| -rw-r--r-- | assets/mus/game/onwards.mp3 | bin | 0 -> 1478686 bytes | |||
| -rw-r--r-- | assets/mus/game/onwards.wav | bin | 16588844 -> 0 bytes | |||
| -rw-r--r-- | assets/mus/game/paris.mp3 | bin | 0 -> 1858737 bytes | |||
| -rw-r--r-- | assets/mus/game/paris.wav | bin | 22272044 -> 0 bytes | |||
| -rw-r--r-- | assets/mus/game/shopping_spree.mp3 | bin | 0 -> 1830214 bytes | |||
| -rw-r--r-- | assets/mus/game/shopping_spree.wav | bin | 20160044 -> 0 bytes | |||
| -rw-r--r-- | assets/mus/menu/mus_menu_intro.mp3 | bin | 0 -> 531777 bytes | |||
| -rw-r--r-- | assets/mus/menu/mus_menu_intro.ogg | bin | 187386 -> 0 bytes | |||
| -rw-r--r-- | assets/mus/menu/mus_menu_loop.mp3 | bin | 0 -> 2541201 bytes | |||
| -rw-r--r-- | assets/mus/menu/mus_menu_loop.ogg | bin | 865507 -> 0 bytes | |||
| -rw-r--r-- | core/src/kz/ilotterytea/maxon/screens/MenuScreen.java | 2 | ||||
| -rw-r--r-- | core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java | 8 |
14 files changed, 5 insertions, 5 deletions
diff --git a/assets/mus/game/adieu.mp3 b/assets/mus/game/adieu.mp3 Binary files differnew file mode 100644 index 0000000..807e6b4 --- /dev/null +++ b/assets/mus/game/adieu.mp3 diff --git a/assets/mus/game/adieu.wav b/assets/mus/game/adieu.wav Binary files differdeleted file mode 100644 index ff28b58..0000000 --- a/assets/mus/game/adieu.wav +++ /dev/null diff --git a/assets/mus/game/onwards.mp3 b/assets/mus/game/onwards.mp3 Binary files differnew file mode 100644 index 0000000..81cab86 --- /dev/null +++ b/assets/mus/game/onwards.mp3 diff --git a/assets/mus/game/onwards.wav b/assets/mus/game/onwards.wav Binary files differdeleted file mode 100644 index 24ce5dd..0000000 --- a/assets/mus/game/onwards.wav +++ /dev/null diff --git a/assets/mus/game/paris.mp3 b/assets/mus/game/paris.mp3 Binary files differnew file mode 100644 index 0000000..b60d9d9 --- /dev/null +++ b/assets/mus/game/paris.mp3 diff --git a/assets/mus/game/paris.wav b/assets/mus/game/paris.wav Binary files differdeleted file mode 100644 index a978739..0000000 --- a/assets/mus/game/paris.wav +++ /dev/null diff --git a/assets/mus/game/shopping_spree.mp3 b/assets/mus/game/shopping_spree.mp3 Binary files differnew file mode 100644 index 0000000..4f90f4d --- /dev/null +++ b/assets/mus/game/shopping_spree.mp3 diff --git a/assets/mus/game/shopping_spree.wav b/assets/mus/game/shopping_spree.wav Binary files differdeleted file mode 100644 index 20c2b6e..0000000 --- a/assets/mus/game/shopping_spree.wav +++ /dev/null diff --git a/assets/mus/menu/mus_menu_intro.mp3 b/assets/mus/menu/mus_menu_intro.mp3 Binary files differnew file mode 100644 index 0000000..b119446 --- /dev/null +++ b/assets/mus/menu/mus_menu_intro.mp3 diff --git a/assets/mus/menu/mus_menu_intro.ogg b/assets/mus/menu/mus_menu_intro.ogg Binary files differdeleted file mode 100644 index 1661db9..0000000 --- a/assets/mus/menu/mus_menu_intro.ogg +++ /dev/null diff --git a/assets/mus/menu/mus_menu_loop.mp3 b/assets/mus/menu/mus_menu_loop.mp3 Binary files differnew file mode 100644 index 0000000..4023e1f --- /dev/null +++ b/assets/mus/menu/mus_menu_loop.mp3 diff --git a/assets/mus/menu/mus_menu_loop.ogg b/assets/mus/menu/mus_menu_loop.ogg Binary files differdeleted file mode 100644 index 7a081aa..0000000 --- a/assets/mus/menu/mus_menu_loop.ogg +++ /dev/null diff --git a/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java b/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java index 5ae30ef..6a2b53b 100644 --- a/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java +++ b/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java @@ -66,7 +66,7 @@ public class MenuScreen implements Screen { Skin friendsSkin = game.assetManager.get("sprites/gui/friends.skin", Skin.class); // Main Menu music: - this.menuMusic = game.assetManager.get("mus/menu/mus_menu_loop.ogg", Music.class); + this.menuMusic = game.assetManager.get("mus/menu/mus_menu_loop.mp3", Music.class); menuMusic.setLooping(true); // Tint the background diff --git a/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java b/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java index 3b8d3aa..70ba779 100644 --- a/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java +++ b/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java @@ -105,10 +105,10 @@ public class GameScreen implements Screen, InputProcessor { decals.add(decalPlayer.getDecal()); playlist = new Playlist( - game.assetManager.get("mus/game/onwards.wav", Music.class), - game.assetManager.get("mus/game/paris.wav", Music.class), - game.assetManager.get("mus/game/adieu.wav", Music.class), - game.assetManager.get("mus/game/shopping_spree.wav", Music.class) + game.assetManager.get("mus/game/onwards.mp3", Music.class), + game.assetManager.get("mus/game/paris.mp3", Music.class), + game.assetManager.get("mus/game/adieu.mp3", Music.class), + game.assetManager.get("mus/game/shopping_spree.mp3", Music.class) ); playlist.setShuffleMode(true); if (game.prefs.getBoolean("music", true)) playlist.next(); |