Skip to content
Snippets Groups Projects
Commit af95a3bf authored by Turid Cecilie Dahl's avatar Turid Cecilie Dahl
Browse files

#86 Adds correct explanation for game

parent 849fee38
No related branches found
No related tags found
2 merge requests!90Dev,!83Resolve "Usability fixes"
...@@ -194,8 +194,7 @@ public class CreateNewTournamentState extends State { ...@@ -194,8 +194,7 @@ public class CreateNewTournamentState extends State {
Table innerInnerTable = new Table(); Table innerInnerTable = new Table();
innerInnerTable.defaults().space(spacingLittle); innerInnerTable.defaults().space(spacingLittle);
//TODO: endre g.getName til g.getExplanation() innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getExplanation().replaceAll("\\\\n", "\n"), skin)))).spaceBottom(spacingLittle);
innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getName(), skin)))).spaceBottom(spacingLittle);
innerInnerTable.row(); innerInnerTable.row();
CheckBox gameCB = new CheckBox("",skin); CheckBox gameCB = new CheckBox("",skin);
......
...@@ -87,8 +87,7 @@ public class SinglePlayerSelectGameState extends State { ...@@ -87,8 +87,7 @@ public class SinglePlayerSelectGameState extends State {
innerTable.add(new Image(GameWare.getInstance().getGameIdToPlayState().get(g.getId()).screenshot)).width(imageWidthAndHeigh).height(imageWidthAndHeigh).pad(spacingLittle); innerTable.add(new Image(GameWare.getInstance().getGameIdToPlayState().get(g.getId()).screenshot)).width(imageWidthAndHeigh).height(imageWidthAndHeigh).pad(spacingLittle);
Table innerInnerTable = new Table(); Table innerInnerTable = new Table();
//TODO: endre g.getName til g.getExplanation() innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getExplanation().replaceAll("\\\\n", "\n"), skin)))).spaceBottom(spacingLittle);
innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getName(), skin)))).spaceBottom(spacingLittle);
innerInnerTable.row(); innerInnerTable.row();
TextButton gameBtn = new TextButton(playBtnText, skin); TextButton gameBtn = new TextButton(playBtnText, skin);
......
...@@ -100,8 +100,7 @@ public class ViewHighScoreState extends State { ...@@ -100,8 +100,7 @@ public class ViewHighScoreState extends State {
innerTable.add(new Image(GameWare.getInstance().getGameIdToPlayState().get(g.getId()).screenshot)).width(imageWidthAndHeigh).height(imageWidthAndHeigh).pad(spacingLittle); innerTable.add(new Image(GameWare.getInstance().getGameIdToPlayState().get(g.getId()).screenshot)).width(imageWidthAndHeigh).height(imageWidthAndHeigh).pad(spacingLittle);
Table innerInnerTable = new Table(); Table innerInnerTable = new Table();
//TODO: endre g.getName til g.getExplanation() innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getExplanation().replaceAll("\\\\n", "\n"), skin)))).spaceBottom(spacingLittle);
innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getName(), skin)))).spaceBottom(spacingLittle);
innerInnerTable.row(); innerInnerTable.row();
TextButton gameBtn = new TextButton(BtnText, skin); TextButton gameBtn = new TextButton(BtnText, skin);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment