diff options
| author | ilotterytea <iltsu@alright.party> | 2022-11-25 21:00:09 +0600 |
|---|---|---|
| committer | ilotterytea <iltsu@alright.party> | 2022-11-25 21:00:09 +0600 |
| commit | b767cd9d86f0070e4f4590fd5defbe8af6ac9e29 (patch) | |
| tree | 92f71acbb3b35ae5876321b6bff73b14df63e8b5 /core/src/com/ilotterytea/maxoning/utils | |
| parent | d79ded077f4c2d4375ef96df9bdb9c3f5e3c0450 (diff) | |
| parent | 7e4562c323cdcf323b5067261fcae002508fadd6 (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# assets/sprites/gui/widgeticons.skin
Diffstat (limited to 'core/src/com/ilotterytea/maxoning/utils')
| -rw-r--r-- | core/src/com/ilotterytea/maxoning/utils/AssetLoading.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/src/com/ilotterytea/maxoning/utils/AssetLoading.java b/core/src/com/ilotterytea/maxoning/utils/AssetLoading.java index aba31fa..271163d 100644 --- a/core/src/com/ilotterytea/maxoning/utils/AssetLoading.java +++ b/core/src/com/ilotterytea/maxoning/utils/AssetLoading.java @@ -17,6 +17,7 @@ public class AssetLoading { am.load("sprites/gui/icons.atlas", TextureAtlas.class); am.load("sprites/gui/ilotterytea.atlas", TextureAtlas.class); am.load("sprites/gui/widgets.atlas", TextureAtlas.class); + am.load("sprites/gui/widgeticons.atlas", TextureAtlas.class); // Cat item textures: am.load("sprites/sheet/loadingCircle.png", Texture.class); |