Skip to content

Commit

Permalink
Button graphics updated. Release 1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
andrzej-nov committed Apr 17, 2022
1 parent e11e0d5 commit 7a2cf30
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 110 deletions.
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ android {
applicationId "com.andrzejn.chainrelations"
minSdkVersion 19
targetSdkVersion 30
versionCode 1
versionName "1.0"
versionCode 2
versionName "1.1"
multiDexEnabled true
}
compileOptions {
Expand Down
120 changes: 20 additions & 100 deletions assets/Main.atlas
Original file line number Diff line number Diff line change
Expand Up @@ -16,128 +16,58 @@ gear
index: -1
black
rotate: false
xy: 20, 230
xy: 20, 170
size: 1, 1
index: -1
darkgrey
rotate: false
xy: 80, 230
xy: 80, 170
size: 1, 1
index: -1
lightgrey
rotate: false
xy: 140, 230
xy: 140, 170
size: 1, 1
index: -1
white
rotate: false
xy: 210, 230
xy: 210, 170
size: 1, 1
index: -1
ball
rotate: false
xy: 420, 0
size: 300, 300
index: -1
home
rotate: false
xy: 5, 280
size: 76, 76
index: -1
play
rotate: false
xy: 113, 280
size: 76, 76
index: -1
pause
rotate: false
xy: 222, 280
size: 76, 76
index: -1
options
rotate: false
xy: 330, 280
size: 76, 76
index: -1
accept
rotate: false
xy: 5, 370
size: 76, 76
index: -1
cancel
rotate: false
xy: 113, 370
size: 76, 76
xy: 0, 200
size: 100, 100
index: -1
rotateleft
rotate: false
xy: 222, 370
size: 76, 76
index: -1
poweroff
rotate: false
xy: 330, 370
size: 76, 76
index: -1
mail
rotate: false
xy: 5, 460
size: 76, 76
index: -1
leaderboard
rotate: false
xy: 113, 460
size: 76, 76
index: -1
music
rotate: false
xy: 222, 460
size: 76, 76
index: -1
rotateright
rotate: false
xy: 330, 460
size: 76, 76
index: -1
movedown
rotate: false
xy: 5, 550
size: 76, 76
index: -1
moveup
settings
rotate: false
xy: 113, 550
size: 76, 76
xy: 110, 200
size: 100, 100
index: -1
moveright
hit
rotate: false
xy: 222, 550
size: 76, 76
xy: 220, 200
size: 100, 100
index: -1
moveleft
exit
rotate: false
xy: 330, 550
size: 76, 76
xy: 0, 310
size: 100, 100
index: -1
help
rotate: false
xy: 5, 640
size: 76, 76
index: -1
sound
rotate: false
xy: 113, 640
size: 76, 76
xy: 110, 310
size: 100, 100
index: -1
lock
info
rotate: false
xy: 222, 640
size: 76, 76
index: -1
settings
rotate: false
xy: 330, 640
size: 76, 76
xy: 220, 310
size: 100, 100
index: -1
icongmail
rotate: false
Expand All @@ -149,21 +79,11 @@ icontelegram
xy: 420, 515
size: 150, 150
index: -1
iconfacebook
rotate: false
xy: 420, 665
size: 150, 150
index: -1
icongithub
rotate: false
xy: 420, 815
size: 150, 150
index: -1
icondonate
rotate: false
xy: 570, 515
size: 150, 150
index: -1
darktheme
rotate: false
xy: 570, 665
Expand Down
Binary file modified assets/atlas.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ allprojects {
apply plugin: "eclipse"
apply plugin: 'idea'

version = '1.0'
version = '1.1'
ext {
appName = "ChainRelations"
}
Expand Down
10 changes: 6 additions & 4 deletions core/src/com/andrzejn/chainrelations/Context.kt
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,14 @@ class Context(
private val white: TextureRegion get() = texture("white")
val ball: TextureRegion get() = texture("ball")
val logo: TextureRegion get() = texture("logo")
val home: TextureRegion get() = texture("home")

val play: TextureRegion get() = texture("play")
val exit: TextureRegion get() = texture("poweroff")
val options: TextureRegion get() = texture("options")
val settings: TextureRegion get() = texture("settings")
val exit: TextureRegion get() = texture("exit")
val help: TextureRegion get() = texture("help")
val hit: TextureRegion get() = texture("cancel")
val info: TextureRegion get() = texture("info")
val hit: TextureRegion get() = texture("hit")

val hand: TextureRegion get() = texture("hand")
val gear: TextureRegion get() = texture("gear")
val icongmail: TextureRegion get() = texture("icongmail")
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/andrzejn/chainrelations/CreditsScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class CreditsScreen(
private val icontelegram = Sprite(ctx.icontelegram)
private val icongithub = Sprite(ctx.icongithub)
private val exit = Sprite(ctx.exit)
private val home = Sprite(ctx.home)
private val home = Sprite(ctx.settings)

/**
* Invoked on each screen resize
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/andrzejn/chainrelations/GameScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class GameScreen(

private val ball = Sprite(ctx.ball)
private val play = Sprite(ctx.play).also { it.setAlpha(0.8f) }
private val home = Sprite(ctx.home).also { it.setAlpha(0.8f) }
private val home = Sprite(ctx.settings).also { it.setAlpha(0.8f) }
private val help = Sprite(ctx.help).also { it.setAlpha(0.8f) }
private val exit = Sprite(ctx.exit).also { it.setAlpha(0.8f) }
private val hit = Sprite(ctx.hit).also { it.setAlpha(0.8f) }
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/andrzejn/chainrelations/HomeScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class HomeScreen(
private val logo = Sprite(ctx.logo)
private val play = Sprite(ctx.play)
private val exit = Sprite(ctx.exit)
private val options = Sprite(ctx.options)
private val options = Sprite(ctx.info)
private val gear = Sprite(ctx.gear)
private val darktheme = Sprite(ctx.darktheme)
private val lighttheme = Sprite(ctx.lighttheme)
Expand Down

0 comments on commit 7a2cf30

Please sign in to comment.