Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

Progark gruppe 3
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

0bde3edf

Commit 0bde3edf authored 5 years ago by Haakon Gunleiksrud

Downloads
- Plain Diff

Merge branch '62-scorestate' into 'dev'

Resolve "ScoreState"

Closes #62

See merge request !59

parents 0a792a7a 9948812c

No related branches found

No related tags found

1 merge request!59Resolve "ScoreState"

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

frontend/android/assets/bg_score.jpg 0 additions, 0 deletions

frontend/android/assets/bg_score.jpg
frontend/core/src/com/gameware/game/states/BubbleWrapState.java 1 addition, 2 deletions

...nd/core/src/com/gameware/game/states/BubbleWrapState.java
frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java 1 addition, 0 deletions

...c/com/gameware/game/states/CreateJoinTournamentState.java
frontend/core/src/com/gameware/game/states/MenuState.java 5 additions, 1 deletion

frontend/core/src/com/gameware/game/states/MenuState.java
frontend/core/src/com/gameware/game/states/PlayStateTemplate.java 4 additions, 2 deletions

.../core/src/com/gameware/game/states/PlayStateTemplate.java
frontend/core/src/com/gameware/game/states/ScoreState.java 85 additions, 0 deletions

frontend/core/src/com/gameware/game/states/ScoreState.java
frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java 2 additions, 0 deletions

...com/gameware/game/states/SinglePlayerSelectGameState.java
frontend/core/src/com/gameware/game/states/State.java 1 addition, 0 deletions

frontend/core/src/com/gameware/game/states/State.java
frontend/core/src/com/gameware/game/states/ViewTournamentState.java 2 additions, 0 deletions

...ore/src/com/gameware/game/states/ViewTournamentState.java

with 101 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment