Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Sinister Zeta Project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

904e9f9b

Commit 904e9f9b authored 4 years ago by Dallin Nickel (djn011)

Downloads
- Plain Diff

Merge branch 'feature-implement-ui' into 'feature-rebind-keys'

Add UI to feature branch

See merge request !38

parents 4d82a6d9 555c110f

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/model/Action.java 1 addition, 1 deletion

src/model/Action.java
src/model/Hotkey.java 3 additions, 3 deletions

src/model/Hotkey.java
src/ui/KeybindView.java 74 additions, 0 deletions

src/ui/KeybindView.java
src/ui/Main.java 20 additions, 0 deletions

src/ui/Main.java
src/ui/OptionsList.java 47 additions, 0 deletions

src/ui/OptionsList.java
src/ui/keyValueMap.java 121 additions, 0 deletions

src/ui/keyValueMap.java
src/ui/main.fxml 0 additions, 9 deletions

src/ui/main.fxml
src/ui/mainScreen.java 156 additions, 0 deletions

src/ui/mainScreen.java

with 422 additions and 13 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