mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-12 00:39:56 +07:00
Added Github icon+link on main menu
Some checks failed
Conflict marking / main (push) Failing after 13s
Detekt / detekt (ubuntu-latest) (push) Failing after 48s
Docker / build (push) Failing after 39s
Generate mkdocs from docs folder / deploy (push) Failing after 32s
Build and test / Check code and run unit tests (push) Failing after 50m10s
Close stale issues and PRs / stale (push) Successful in 17s
Some checks failed
Conflict marking / main (push) Failing after 13s
Detekt / detekt (ubuntu-latest) (push) Failing after 48s
Docker / build (push) Failing after 39s
Generate mkdocs from docs folder / deploy (push) Failing after 32s
Build and test / Check code and run unit tests (push) Failing after 50m10s
Close stale issues and PRs / stale (push) Successful in 17s
Removed "community" submenu
This commit is contained in:
BIN
android/Images.Icons/OtherIcons/Github.png
Normal file
BIN
android/Images.Icons/OtherIcons/Github.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 6.7 KiB |
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Before Width: | Height: | Size: 561 KiB After Width: | Height: | Size: 566 KiB |
@ -1251,7 +1251,6 @@ Quickstart =
|
|||||||
Cannot start game with the default new game parameters! =
|
Cannot start game with the default new game parameters! =
|
||||||
Victory status =
|
Victory status =
|
||||||
Social policies =
|
Social policies =
|
||||||
Community =
|
|
||||||
Close =
|
Close =
|
||||||
Do you want to exit the game? =
|
Do you want to exit the game? =
|
||||||
Exit =
|
Exit =
|
||||||
|
@ -208,12 +208,22 @@ class MainMenuScreen: BaseScreen(), RecreateOnResize {
|
|||||||
civilopediaButton.setPosition(30f, 30f)
|
civilopediaButton.setPosition(30f, 30f)
|
||||||
stage.addActor(civilopediaButton)
|
stage.addActor(civilopediaButton)
|
||||||
|
|
||||||
|
val rightSideButtons = Table().apply { defaults().pad(10f) }
|
||||||
val discordButton = ImageGetter.getImage("OtherIcons/Discord")
|
val discordButton = ImageGetter.getImage("OtherIcons/Discord")
|
||||||
.surroundWithCircle(60f, color = skinStrings.skinConfig.baseColor)
|
.surroundWithCircle(60f, color = skinStrings.skinConfig.baseColor)
|
||||||
.surroundWithThinCircle(Color.WHITE)
|
.surroundWithThinCircle(Color.WHITE)
|
||||||
.onActivation { Gdx.net.openURI("https://discord.gg/bjrB4Xw") }
|
.onActivation { Gdx.net.openURI("https://discord.gg/bjrB4Xw") }
|
||||||
discordButton.setPosition(stage.width-30f-discordButton.width, 30f)
|
rightSideButtons.add(discordButton)
|
||||||
stage.addActor(discordButton)
|
|
||||||
|
val githubButton = ImageGetter.getImage("OtherIcons/Github")
|
||||||
|
.surroundWithCircle(60f, color = skinStrings.skinConfig.baseColor)
|
||||||
|
.surroundWithThinCircle(Color.WHITE)
|
||||||
|
.onActivation { Gdx.net.openURI("https://github.com/yairm210/Unciv") }
|
||||||
|
rightSideButtons.add(githubButton)
|
||||||
|
|
||||||
|
rightSideButtons.pack()
|
||||||
|
rightSideButtons.setPosition(stage.width - 30, 30f, Align.bottomRight)
|
||||||
|
stage.addActor(rightSideButtons)
|
||||||
|
|
||||||
|
|
||||||
val versionLabel = "{Version} ${UncivGame.VERSION.text}".toLabel()
|
val versionLabel = "{Version} ${UncivGame.VERSION.text}".toLabel()
|
||||||
|
@ -1,26 +0,0 @@
|
|||||||
package com.unciv.ui.screens.worldscreen.mainmenu
|
|
||||||
|
|
||||||
import com.badlogic.gdx.Gdx
|
|
||||||
import com.unciv.ui.popups.Popup
|
|
||||||
import com.unciv.ui.screens.worldscreen.WorldScreen
|
|
||||||
|
|
||||||
class WorldScreenCommunityPopup(val worldScreen: WorldScreen) : Popup(worldScreen, scrollable = Scrollability.All) {
|
|
||||||
init {
|
|
||||||
addButton("Discord") {
|
|
||||||
Gdx.net.openURI("https://discord.gg/bjrB4Xw")
|
|
||||||
close()
|
|
||||||
}.row()
|
|
||||||
|
|
||||||
addButton("Github") {
|
|
||||||
Gdx.net.openURI("https://github.com/yairm210/Unciv")
|
|
||||||
close()
|
|
||||||
}.row()
|
|
||||||
|
|
||||||
addButton("Reddit") {
|
|
||||||
Gdx.net.openURI("https://www.reddit.com/r/Unciv/")
|
|
||||||
close()
|
|
||||||
}.row()
|
|
||||||
|
|
||||||
addCloseButton()
|
|
||||||
}
|
|
||||||
}
|
|
@ -71,10 +71,6 @@ class WorldScreenMenuPopup(
|
|||||||
worldScreen.openOptionsPopup(withDebug = true)
|
worldScreen.openOptionsPopup(withDebug = true)
|
||||||
}
|
}
|
||||||
optionsCell.nextColumn()
|
optionsCell.nextColumn()
|
||||||
addButton("Community") {
|
|
||||||
close()
|
|
||||||
WorldScreenCommunityPopup(worldScreen).open(force = true)
|
|
||||||
}.nextColumn()
|
|
||||||
if (showMusic)
|
if (showMusic)
|
||||||
addButton("Music", KeyboardBinding.MusicPlayer) {
|
addButton("Music", KeyboardBinding.MusicPlayer) {
|
||||||
close()
|
close()
|
||||||
|
Reference in New Issue
Block a user