Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #759 from kevlahnota/master

Browse Source 
centered unlock awards and double res shop
This commit is contained in:
Anthony Calosa
2016-07-17 08:36:18 +08:00
committed by GitHub
parent 093b370903 d70fd8c208
commit 6e8f74af15
10 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/Android/AndroidManifest.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?xml version="1.0" encoding="utf-8" standalone="no"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="0192" android:versionName="@string/app_version" package="net.wagic.app"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="0201" android:versionName="@string/app_version" package="net.wagic.app">
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>

4
projects/mtg/Android/res/values/strings.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Wagic</string> <string name="app_name">Wagic</string>
<string name="app_version">0.19.2</string> <string name="app_version">0.20.1</string>
<string name="info_text">Wagic v0.19.2\\nAll Rights Reserved.</string> <string name="info_text">Wagic v0.20.1\\nAll Rights Reserved.</string>
</resources> </resources>

BIN
projects/mtg/bin/Res/graphics/shop.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 405 KiB

BIN
projects/mtg/bin/Res/graphics/shop_light.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 150 KiB

1
projects/mtg/bin/Res/graphics/wallpapers.txt
View File

@@ -5,7 +5,6 @@ wallpapers/wagic1.jpg
wallpapers/kaioshin_garruk.jpg wallpapers/kaioshin_garruk.jpg
wallpapers/kaioshin_jace.jpg wallpapers/kaioshin_jace.jpg
graphics/shop.jpg graphics/shop.jpg
themes/Classic/backdrop.jpg
wallpapers/kaioshin_ravager.jpg wallpapers/kaioshin_ravager.jpg
wallpapers/kaioshin_elsXIII.jpg wallpapers/kaioshin_elsXIII.jpg
wallpapers/kaioshin_sorin.jpg wallpapers/kaioshin_sorin.jpg

4
projects/mtg/build.number.properties
View File

@@ -1,6 +1,6 @@
#build.number.properties (normally this file is maintained by build.xml) #build.number.properties (normally this file is maintained by build.xml)
#Sun, 06 May 2012 11:56:35 -0700 #Sun, 06 May 2012 11:56:35 -0700
build.major=0 build.major=0
build.minor=19 build.minor=20
build.point=2 build.point=1

2
projects/mtg/build.xml
View File

@@ -77,7 +77,7 @@ Author: Michael Nguyen
#define WAGIC_VERSION_MAJOR ${build.major} #define WAGIC_VERSION_MAJOR ${build.major}
#define WAGIC_VERSION_MEDIUM ${build.minor} #define WAGIC_VERSION_MEDIUM ${build.minor}
#define WAGIC_VERSION_MINOR ${build.point} #define WAGIC_VERSION_MINOR ${build.point}
#define WAGIC_VERSION_REVISION ${env.TRAVIS_BUILD_NUMBER} #define WAGIC_VERSION_REVISION ((${env.TRAVIS_BUILD_NUMBER})-1198)
#define VERSION_DOT(a, b, c, d) a ##.## b ##.## c ##.## d #define VERSION_DOT(a, b, c, d) a ##.## b ##.## c ##.## d
#define VERSION_WITHOUT_DOT(a, b, c) a ## b ## c #define VERSION_WITHOUT_DOT(a, b, c) a ## b ## c

4
projects/mtg/include/Wagic_Version.h
View File

@@ -12,8 +12,8 @@ Author: Michael Nguyen
/* Wagic versions */ /* Wagic versions */
#define WAGIC_VERSION_MAJOR 0 #define WAGIC_VERSION_MAJOR 0
#define WAGIC_VERSION_MEDIUM 19 #define WAGIC_VERSION_MEDIUM 20
#define WAGIC_VERSION_MINOR 2 #define WAGIC_VERSION_MINOR 1
#define VERSION_DOT(a, b, c) a ##.## b ##.## c #define VERSION_DOT(a, b, c) a ##.## b ##.## c
#define VERSION_WITHOUT_DOT(a, b, c) a ## b ## c #define VERSION_WITHOUT_DOT(a, b, c) a ## b ## c

3
projects/mtg/src/Credits.cpp
View File

@@ -531,7 +531,8 @@ void Credits::Render()
if (unlockedQuad) if (unlockedQuad)
{ {
showMsg = 0; 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()) if (unlockedString.size())
{ {

5
projects/mtg/src/GameStateShop.cpp
View File

@@ -704,7 +704,7 @@ void GameStateShop::Render()
JQuadPtr mBg = WResourceManager::Instance()->RetrieveTempQuad("shop.jpg", TEXTURE_SUB_5551); JQuadPtr mBg = WResourceManager::Instance()->RetrieveTempQuad("shop.jpg", TEXTURE_SUB_5551);
if (mBg.get()) 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); JQuadPtr quad = WResourceManager::Instance()->RetrieveTempQuad("shop_light.jpg", TEXTURE_SUB_5551);
if (quad.get()) if (quad.get())
@@ -712,7 +712,8 @@ void GameStateShop::Render()
r->EnableTextureFilter(false); r->EnableTextureFilter(false);
r->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE); r->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE);
quad->SetColor(ARGB(lightAlpha,255,255,255)); 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->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA);
r->EnableTextureFilter(true); r->EnableTextureFilter(true);
} }