Merge branch 'prototype' into 'feature-os-interface'
# Conflicts: # src/Main.java
Branches feature-os-interface
No related tags found
Showing
- src/Main.java 5 additions, 7 deletionssrc/Main.java
- src/model/Action.java 3 additions, 0 deletionssrc/model/Action.java
- src/ui/KeybindView.java 74 additions, 0 deletionssrc/ui/KeybindView.java
- src/ui/OptionsList.java 47 additions, 0 deletionssrc/ui/OptionsList.java
- src/ui/keyValueMap.java 121 additions, 0 deletionssrc/ui/keyValueMap.java
- src/ui/main.fxml 0 additions, 9 deletionssrc/ui/main.fxml
- src/ui/mainScreen.java 156 additions, 0 deletionssrc/ui/mainScreen.java
src/ui/KeybindView.java
0 → 100644
src/ui/OptionsList.java
0 → 100644
src/ui/keyValueMap.java
0 → 100644
src/ui/main.fxml
deleted
100644 → 0
src/ui/mainScreen.java
0 → 100644
Please register or sign in to comment