Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

W

Wargames
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

c7a5a479

Commit c7a5a479 authored 3 years ago by Carl Gützkow

Downloads
- Plain Diff

Merge branch 'feat/change-terrain' into 'master'

feat: terrain is now selectable

Closes #19

See merge request !25

parents f6fa36e1 3ed214cd

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 5
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/edu/ntnu/idatt2001/carljgu/battle/Battle.java 7 additions, 4 deletions

src/main/java/edu/ntnu/idatt2001/carljgu/battle/Battle.java
src/main/java/edu/ntnu/idatt2001/carljgu/client/App.java 2 additions, 1 deletion

src/main/java/edu/ntnu/idatt2001/carljgu/client/App.java
src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleController.java 23 additions, 2 deletions

...a/edu/ntnu/idatt2001/carljgu/client/BattleController.java
src/main/resources/stylesheet.css 9 additions, 0 deletions

src/main/resources/stylesheet.css
src/main/resources/wargames.fxml 70 additions, 58 deletions

src/main/resources/wargames.fxml

with 111 additions and 65 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