Skip to content

Commit

Permalink
Halma v12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
PoopJournal committed Mar 24, 2024
2 parents a5f73cb + 67c00d0 commit 01b6908
Show file tree
Hide file tree
Showing 32 changed files with 751 additions and 179 deletions.
7 changes: 3 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
android {
buildToolsVersion "31.0.0"
compileSdkVersion 31
compileSdk 34
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
Expand All @@ -20,8 +19,8 @@ android {
applicationId "app.halma"
minSdkVersion 14
targetSdkVersion 34
versionCode 11
versionName "11.0"
versionCode 12
versionName "12.0"
}
buildTypes {
release {
Expand Down
Binary file added assets/redesign/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/redesign/cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/redesign/tick.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions assets/strings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,18 @@ viewSource=View source code
director=Director:Marvin
leadDev=Lead developer:Martin
repoURL=https://github.com/Crazy-Marvin/Halma
termsURL=https://crazymarvin.com/halma/terms-of-service
privacyURL=https://crazymarvin.com/halma/privacy-policy
translationsURL=https://hosted.weblate.org/engage/halma/
translations=Translations
terms=Terms of Service
privacy=Privacy Policy

# MainMenu
newGame=New Game
about=About
help=Help
settings=Settings

# PlayConfig
mode=Mode
Expand All @@ -23,3 +30,10 @@ offline=Offline
square=Square
star=Star
startGame=Start Game

#Settings
difficulty=Difficulty
easy=Easy
medium=Medium
hard=Hard
errorMonitor=Error & performance monitoring
15 changes: 15 additions & 0 deletions assets/strings_da.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,19 @@

# About
viewSource=Vis kildekoden
termsURL=https://crazymarvin.com/halma/terms-of-service
privacyURL=https://crazymarvin.com/halma/privacy-policy
translationsURL=https://hosted.weblate.org/engage/halma/
translations=Oversættelser
terms=Servicevilkår
privacy=Fortrolighedspolitik

# MainMenu
newGame=Nyt spil
about=Om
repoURL=https://github.com/Crazy-Marvin/Halma
help=Hj\u00E6lp
settings=Indstillinger

# PlayConfig
mode=Modus
Expand All @@ -20,3 +27,11 @@ bots=Botter
online=Opkoblet
startGame=Start spil
star=Stjerne


#Settings
difficulty=Vanskelighed
easy=Let
medium=Medium
hard=Hårdt
errorMonitor=Overvågning af fejl og ydeevne
15 changes: 15 additions & 0 deletions assets/strings_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ viewSource=Quellcode anzeigen
newGame=Neues Spiel
about=\u00DCber
help=Hilfe
settings=Einstellungen

# PlayConfig #
mode=Modus
Expand All @@ -21,3 +22,17 @@ square=Platz
star=Stern
startGame=Spiel starten
repoURL=https://github.com/Crazy-Marvin/Halma
termsURL=https://crazymarvin.com/halma/terms-of-service
privacyURL=https://crazymarvin.com/halma/privacy-policy
translationsURL=https://hosted.weblate.org/engage/halma/
translations=Übersetzungen
terms=Nutzungsbedingungen
privacy=Datenschutzrichtlinie


#Settings
difficulty=Schwierigkeit
easy=Einfach
medium=Mittel
hard=Hart
errorMonitor=Fehler- und Leistungsüberwachung
15 changes: 15 additions & 0 deletions assets/strings_es.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,18 @@ viewSource=Ver el c\u00F3digo fuente
director=Director: Marvin
leadDev=Desarrollador principal:Martin
repoURL=https://github.com/Crazy-Marvin/Halma
termsURL=https://crazymarvin.com/halma/terms-of-service
privacyURL=https://crazymarvin.com/halma/privacy-policy
translationsURL=https://hosted.weblate.org/engage/halma/
translations=Traducciones
terms=Términos de servicio
privacy=política de privacidad

# MainMenu
newGame=Nuevo juego
about=Acerca de
help=Ayuda
settings=Ajustes

# PlayConfig
mode=Modo
Expand All @@ -22,3 +29,11 @@ offline=Sin conexi\u00F3n
square=Cuadrado
star=Estrella
startGame=Comenzar el juego


#Settings
difficulty=Dificultad
easy=Fácil
medium=Medio
hard=Duro
errorMonitor=Monitoreo de errores y desempeño
15 changes: 15 additions & 0 deletions assets/strings_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,16 @@
offline=Hors ligne
help=Aide
repoURL=https://github.com/Crazy-Marvin/Halma
termsURL=https://crazymarvin.com/halma/terms-of-service
privacyURL=https://crazymarvin.com/halma/privacy-policy
translationsURL=https://hosted.weblate.org/engage/halma/
translations=Traductions
terms=Conditions d'utilisation
privacy=politique de confidentialité

# MainMenu
newGame=Nouvelle partie
settings=Paramètres

# PlayConfig
mode=Mode
Expand All @@ -18,3 +25,11 @@ startGame=Commencer la partie
# About
viewSource=Voir le code source
about=\u00C0 propos


#Settings
difficulty=Difficulté
easy=Facile
medium=Moyen
hard=Dur
errorMonitor=Surveillance des erreurs et des performances
17 changes: 17 additions & 0 deletions assets/strings_id.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@


director=Direktur: Marvin
leadDev=Pengembang utama: Martin

# MainMenu
newGame=Permainan Baru
board=Papan

# About
viewSource=Lihat kode sumber
repoURL=https://github.com/Crazy-Marvin/Halma
about=Tentang
help=Bantuan

# PlayConfig
mode=Mode
15 changes: 15 additions & 0 deletions assets/strings_nb_no.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,20 @@
newGame=Nytt spill
about=Om
help=Hjelp
settings=Innstillinger

# PlayConfig
mode=Modus
board=Brett
bots=Botter
square=Plass
repoURL=https://github.com/Crazy-Marvin/Halma
termsURL=https://crazymarvin.com/halma/terms-of-service
privacyURL=https://crazymarvin.com/halma/privacy-policy
translationsURL=https://hosted.weblate.org/engage/halma/
translations=Oversettelser
terms=Vilkår for bruk
privacy=Personvernerklæring

# About
viewSource=Vis kildekode
Expand All @@ -22,3 +29,11 @@ people=Folk
offline=Frakoblet
director=Ledelse:Marvin
leadDev=Hovedutvikler:Martin


#Settings
difficulty=Vanskelighet
easy=Lett
medium=Medium
hard=Hard
errorMonitor=Feil- og ytelsesovervåking
15 changes: 15 additions & 0 deletions assets/strings_sv.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,17 @@

# MainMenu
newGame=Nytt spel
settings=inställningar

# About
viewSource=Via k\u00E4llkoden
repoURL=https://github.com/Crazy-Marvin/Halma
termsURL=https://crazymarvin.com/halma/terms-of-service
privacyURL=https://crazymarvin.com/halma/privacy-policy
translationsURL=https://hosted.weblate.org/engage/halma/
translations=Översättningar
terms=Användarvillkor
privacy=Integritetspolicy

# PlayConfig
mode=Modus
Expand All @@ -22,3 +29,11 @@ about=Om
help=Hj\u00E4lp
leadDev=Huvudutvecklare: Martin
director=Regiss\u00F6r: Marvin


#Settings
difficulty=Svårighet
easy=Lätt
medium=Medium
hard=Hård
errorMonitor=Övervakning av fel och prestanda
13 changes: 7 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
buildscript {
buildscript {

repositories {
mavenLocal()
Expand All @@ -21,8 +21,8 @@ allprojects {
version = '1.0'
ext {
appName = "Halma"
gdxVersion = '1.12.0'
gdxVersion = '1.12.1'

}

repositories {
Expand All @@ -44,7 +44,7 @@ project(":desktop") {
implementation project(":core")
api "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"

}
}

Expand All @@ -60,7 +60,7 @@ project(":android") {
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"

}
}

Expand All @@ -77,7 +77,7 @@ project(":html") {
api "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
api "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
implementation 'com.github.raeleus.TenPatch:tenpatch:5.2.3:sources'
implementation 'org.slf4j:slf4j-simple:2.0.7'
implementation 'org.slf4j:slf4j-simple:2.0.9'
}
}

Expand All @@ -88,5 +88,6 @@ project(":core") {
dependencies {
api "com.badlogicgames.gdx:gdx:$gdxVersion"
implementation 'com.github.raeleus.TenPatch:tenpatch:5.2.3'
implementation 'io.sentry:sentry:7.4.0'
}
}
11 changes: 10 additions & 1 deletion core/src/app/halma/AboutScreen.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public class AboutScreen extends BaseScreen{
Label linkToMartin;
Label viewSource;
Label reportProblem;
Label helpWithTranslation;
Label privacyPolicy;

Table persons;
Table titleTable;
Expand All @@ -33,9 +35,10 @@ private void create(){
titleImage = new Image(skin, "earth");
linkToMarvin = new Label("marvin, main developer", skin); linkToMarvin.setColor(Color.BLUE);
linkToMartin = new Label("martin, co developer", skin); linkToMartin.setColor(Color.BLUE);
helpWithTranslation = new Label("Help with translaiton", skin); linkToMarvin.setColor(Color.BLUE);
privacyPolicy = new Label("Privacy Policy", skin); linkToMarvin.setColor(Color.BLUE);
viewSource = new Label("100% transparent, view source code", skin); viewSource.setColor(Color.BLUE);
reportProblem = new Label("I found a problem, help us making the game better :)", skin); reportProblem.setColor(Color.BLUE);

persons = new Table();
titleTable = new Table();

Expand All @@ -45,6 +48,8 @@ private void create(){

persons.add(linkToMarvin).row();
persons.add(linkToMartin).row();
persons.add(helpWithTranslation);
persons.add(privacyPolicy);
persons.add(viewSource).row();
persons.add(reportProblem);

Expand All @@ -65,6 +70,10 @@ public void clicked(Actor a) {
link = "https://github.com/mmelnizky";
if(a == linkToMarvin)
link = "https://github.com/Crazy-Marvin";
// if (a == helpWIthTranslation)
// link = "https://hosted.weblate.org/engage/halma/";
if (a == privacyPolicy)
link = "https://app.getterms.io/view/7FsFk/privacy/en-us";
if(a == viewSource)
link = "https://github.com/Crazy-Marvin/Halma";
if(a == reportProblem)
Expand Down
14 changes: 11 additions & 3 deletions core/src/app/halma/Halma.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package app.halma;

import app.halma.redesign.Settings;
import app.halma.utils.ErrorMonitoring;
import app.halma.utils.HalmaPreferences;
import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.I18NBundle;
Expand All @@ -11,19 +14,24 @@
public class Halma extends Game {

private I18NBundle bundle;

@Override
public void create () {
public void create() {
System.out.println("program start :)");

if (HalmaPreferences.isMonitoring()) {
ErrorMonitoring.init();
ErrorMonitoring.startMonitoring();
}

// Override to specific language with new Locale("de"), "en", etc.
Locale locale = Locale.getDefault();
System.out.println("your language is:");
System.out.println(locale);
I18NBundle.setSimpleFormatter(true); // Ensure same behaviour on GWT and other platforms
bundle = I18NBundle.createBundle(Gdx.files.internal("strings"), locale);

setScreen(new MainMenu(this));
setScreen(HalmaPreferences.isFirstRun() ? new Settings(this) : new MainMenu(this));
}

I18NBundle getBundle() {
Expand Down
2 changes: 1 addition & 1 deletion core/src/app/halma/play/Board.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class Board {

public Board(boolean isSquare, Stage stage){
this.stage = stage;
this.isSquare = isSquare;
Board.isSquare = isSquare;
}
public Board create(){
if(isSquare)createSquare();
Expand Down
Loading

0 comments on commit 01b6908

Please sign in to comment.