Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

TDT4240 Tank Wars
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Package Registry
- Model registry
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

27226496

Commit 27226496 authored 2 years ago by Jan Einar Thorvaldsen

Downloads
- Plain Diff

Merge branch '12-screen-logic' into 'main'

Resolve "Screen logic"

Closes #12

See merge request !10

parents 54b0b598 b2ed066b

No related branches found

No related tags found

1 merge request!10Resolve "Screen logic"

Pipeline #204367 passed 2 years ago

Stage: backend test

Changes 5
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

frontend/core/src/com/game/tankwars/TankWarsGame.java 12 additions, 21 deletions

frontend/core/src/com/game/tankwars/TankWarsGame.java
frontend/core/src/com/game/tankwars/view/GameOverScreen.java 51 additions, 0 deletions

frontend/core/src/com/game/tankwars/view/GameOverScreen.java
frontend/core/src/com/game/tankwars/view/GameScreen.java 70 additions, 0 deletions

frontend/core/src/com/game/tankwars/view/GameScreen.java
frontend/core/src/com/game/tankwars/view/GameView.java 0 additions, 4 deletions

frontend/core/src/com/game/tankwars/view/GameView.java
frontend/core/src/com/game/tankwars/view/MainMenuScreen.java 54 additions, 0 deletions

frontend/core/src/com/game/tankwars/view/MainMenuScreen.java

with 187 additions and 25 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