diff --git a/projects/mtg/Android/AndroidManifest.xml b/projects/mtg/Android/AndroidManifest.xml index 8fd0e2815..a51c2a6e2 100644 --- a/projects/mtg/Android/AndroidManifest.xml +++ b/projects/mtg/Android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/projects/mtg/Android/res/values/strings.xml b/projects/mtg/Android/res/values/strings.xml index bdcff8685..a6bed85a3 100644 --- a/projects/mtg/Android/res/values/strings.xml +++ b/projects/mtg/Android/res/values/strings.xml @@ -1,6 +1,6 @@ Wagic - 0.19.2 - Wagic v0.19.2\\nAll Rights Reserved. + 0.20.1 + Wagic v0.20.1\\nAll Rights Reserved. diff --git a/projects/mtg/bin/Res/graphics/shop.jpg b/projects/mtg/bin/Res/graphics/shop.jpg index d51511f40..c3b093506 100644 Binary files a/projects/mtg/bin/Res/graphics/shop.jpg and b/projects/mtg/bin/Res/graphics/shop.jpg differ diff --git a/projects/mtg/bin/Res/graphics/shop_light.jpg b/projects/mtg/bin/Res/graphics/shop_light.jpg index 4f4c5b6fc..a1a232f4d 100644 Binary files a/projects/mtg/bin/Res/graphics/shop_light.jpg and b/projects/mtg/bin/Res/graphics/shop_light.jpg differ diff --git a/projects/mtg/bin/Res/graphics/wallpapers.txt b/projects/mtg/bin/Res/graphics/wallpapers.txt index 10365558d..4ad81df17 100644 --- a/projects/mtg/bin/Res/graphics/wallpapers.txt +++ b/projects/mtg/bin/Res/graphics/wallpapers.txt @@ -5,7 +5,6 @@ wallpapers/wagic1.jpg wallpapers/kaioshin_garruk.jpg wallpapers/kaioshin_jace.jpg graphics/shop.jpg -themes/Classic/backdrop.jpg wallpapers/kaioshin_ravager.jpg wallpapers/kaioshin_elsXIII.jpg wallpapers/kaioshin_sorin.jpg diff --git a/projects/mtg/build.number.properties b/projects/mtg/build.number.properties index e7ac65b05..2eb721c07 100644 --- a/projects/mtg/build.number.properties +++ b/projects/mtg/build.number.properties @@ -1,6 +1,6 @@ #build.number.properties (normally this file is maintained by build.xml) #Sun, 06 May 2012 11:56:35 -0700 build.major=0 -build.minor=19 -build.point=2 +build.minor=20 +build.point=1 diff --git a/projects/mtg/include/Wagic_Version.h b/projects/mtg/include/Wagic_Version.h index 82d9d8d4b..58f7175d4 100644 --- a/projects/mtg/include/Wagic_Version.h +++ b/projects/mtg/include/Wagic_Version.h @@ -12,8 +12,8 @@ Author: Michael Nguyen /* Wagic versions */ #define WAGIC_VERSION_MAJOR 0 -#define WAGIC_VERSION_MEDIUM 19 -#define WAGIC_VERSION_MINOR 2 +#define WAGIC_VERSION_MEDIUM 20 +#define WAGIC_VERSION_MINOR 1 #define VERSION_DOT(a, b, c) a ##.## b ##.## c #define VERSION_WITHOUT_DOT(a, b, c) a ## b ## c diff --git a/projects/mtg/src/Credits.cpp b/projects/mtg/src/Credits.cpp index 3e920c178..d6fef3c7a 100644 --- a/projects/mtg/src/Credits.cpp +++ b/projects/mtg/src/Credits.cpp @@ -531,7 +531,8 @@ void Credits::Render() if (unlockedQuad) { showMsg = 0; - r->RenderQuad(unlockedQuad.get(), 20, 20); + unlockedQuad->SetHotSpot(unlockedQuad->mWidth/2,0); + r->RenderQuad(unlockedQuad.get(), SCREEN_WIDTH_F/2, 20, 0, 400.f / unlockedQuad->mWidth, 100.f / unlockedQuad->mHeight); } if (unlockedString.size()) { diff --git a/projects/mtg/src/GameStateShop.cpp b/projects/mtg/src/GameStateShop.cpp index 47f300379..b92f3f82e 100644 --- a/projects/mtg/src/GameStateShop.cpp +++ b/projects/mtg/src/GameStateShop.cpp @@ -704,7 +704,7 @@ void GameStateShop::Render() JQuadPtr mBg = WResourceManager::Instance()->RetrieveTempQuad("shop.jpg", TEXTURE_SUB_5551); if (mBg.get()) - r->RenderQuad(mBg.get(), 0, 0); + r->RenderQuad(mBg.get(), 0, 0, 0, SCREEN_WIDTH_F / mBg->mWidth, SCREEN_HEIGHT_F / mBg->mHeight); JQuadPtr quad = WResourceManager::Instance()->RetrieveTempQuad("shop_light.jpg", TEXTURE_SUB_5551); if (quad.get()) @@ -712,7 +712,8 @@ void GameStateShop::Render() r->EnableTextureFilter(false); r->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE); quad->SetColor(ARGB(lightAlpha,255,255,255)); - r->RenderQuad(quad.get(), 0, 0); + quad->SetHotSpot(0,quad->mHeight); + r->RenderQuad(quad.get(), 0, SCREEN_HEIGHT, 0, 255.f / quad->mWidth, 272.f / quad->mHeight); r->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA); r->EnableTextureFilter(true); }