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

34932d3e

Commit 34932d3e authored 5 years ago by Haakon Gunleiksrud

Downloads
- Plain Diff

#64 Merge with origin/dev.

parents bf172b71 4133c0fa

No related branches found

No related tags found

1 merge request!61Resolve "Start delay frontend"

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

frontend/core/src/com/gameware/game/QueryIntermediate.java 1 addition, 1 deletion

frontend/core/src/com/gameware/game/QueryIntermediate.java
frontend/core/src/com/gameware/game/models/Tournament.java 13 additions, 10 deletions

frontend/core/src/com/gameware/game/models/Tournament.java
frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java 9 additions, 1 deletion

...c/com/gameware/game/states/CreateJoinTournamentState.java
frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java 4 additions, 3 deletions

...rc/com/gameware/game/states/CreateNewTournamentState.java
frontend/core/src/com/gameware/game/states/TournamentHighScoreState.java 7 additions, 2 deletions

...rc/com/gameware/game/states/TournamentHighScoreState.java
frontend/core/src/com/gameware/game/states/ViewTournamentState.java 1 addition, 1 deletion

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

with 35 additions and 18 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