-
Notifications
You must be signed in to change notification settings - Fork 259
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1435 from JamzTheMan/feature-token-vbl-simplifica…
…tion Feature: Token VBL simplification
- Loading branch information
Showing
10 changed files
with
2,706 additions
and
1,166 deletions.
There are no files selected for viewing
Binary file not shown.
282 changes: 227 additions & 55 deletions
282
src/main/java/net/rptools/maptool/client/functions/VBL_Functions.java
Large diffs are not rendered by default.
Oops, something went wrong.
934 changes: 525 additions & 409 deletions
934
src/main/java/net/rptools/maptool/client/ui/token/EditTokenDialog.java
Large diffs are not rendered by default.
Oops, something went wrong.
538 changes: 439 additions & 99 deletions
538
src/main/java/net/rptools/maptool/client/ui/token/TokenVblPanel.java
Large diffs are not rendered by default.
Oops, something went wrong.
378 changes: 256 additions & 122 deletions
378
src/main/java/net/rptools/maptool/client/ui/zone/vbl/TokenVBL.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+29.1 KB
src/main/resources/net/rptools/maptool/client/image/color-picker-256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.94 KB
src/main/resources/net/rptools/maptool/client/image/color-picker-32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,723 changes: 1,249 additions & 474 deletions
1,723
src/main/resources/net/rptools/maptool/client/ui/forms/tokenPropertiesDialog.xml
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters